dev-lxc 2.2.1 → 2.2.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5 -0
- data/README.md +1 -1
- data/docs/prerequisites.md +6 -2
- data/lib/dev-lxc/cluster.rb +9 -2
- data/lib/dev-lxc/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6d9524224ecebf487af039aa0dc080b1d3755e11
|
4
|
+
data.tar.gz: 5ac4b6e2a627b4f3c64768478171eba69406b4bd
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: fbb54b3db80ee6173bafc556822b734f6405677785c51035c8db11f0d6743baa5538adaa0dd777e3c6d2331e92434aa1c865ddd5ad2a60ecc446c2fcf4a1d955
|
7
|
+
data.tar.gz: 0748667276c932fb63b6744aded788364d24b02eddb250768ca99b79bb318f45417949fe5a4bb2250431702d5181c8961f962bdd5e303079e92e717191d98b6e
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,10 @@
|
|
1
1
|
# dev-lxc Change Log
|
2
2
|
|
3
|
+
## 2.2.2 (2016-07-20)
|
4
|
+
|
5
|
+
* Don't calculate/install required products if "build: completed" snapshot exists
|
6
|
+
* Be more explicit about skipping install of chefdk on build nodes
|
7
|
+
|
3
8
|
## 2.2.1 (2016-07-20)
|
4
9
|
|
5
10
|
* Add --include-products option to show-config command
|
data/README.md
CHANGED
@@ -32,7 +32,7 @@ If you aren't familiar with using containers please read this introduction.
|
|
32
32
|
|
33
33
|
### Requirements
|
34
34
|
|
35
|
-
* Please follow the [
|
35
|
+
* Please follow the [Prerequisites Instructions](docs/prerequisites.md)
|
36
36
|
|
37
37
|
When you are done with the prerequisites you should be able to log into the dev-lxc-platform VM and start using it.
|
38
38
|
|
data/docs/prerequisites.md
CHANGED
@@ -29,8 +29,6 @@ Configure .kitchen.yml settings such as cpus, memory, synced_folders as desired.
|
|
29
29
|
|
30
30
|
This should take less than 15 minutes.
|
31
31
|
|
32
|
-
While the VM is being created you are free to open a separate terminal and follow the remaining setup instructions.
|
33
|
-
|
34
32
|
```
|
35
33
|
cd dev-lxc-platform
|
36
34
|
kitchen converge
|
@@ -52,6 +50,12 @@ brew install direnv
|
|
52
50
|
|
53
51
|
Be sure to follow the [direnv install instructions](http://direnv.net/) to add the appropriate line to your user's shell rc file.
|
54
52
|
|
53
|
+
Run the following to approve the `.envrc` file
|
54
|
+
|
55
|
+
```
|
56
|
+
direnv allow
|
57
|
+
```
|
58
|
+
|
55
59
|
#### Setup Networking
|
56
60
|
|
57
61
|
Your workstation needs to know how to resolve the .lxc domain that dev-lxc containers use.
|
data/lib/dev-lxc/cluster.rb
CHANGED
@@ -395,8 +395,9 @@ module DevLXC
|
|
395
395
|
end
|
396
396
|
servers = get_sorted_servers(server_name_regex)
|
397
397
|
servers.each do |server|
|
398
|
-
|
399
|
-
|
398
|
+
if @server_configs[server.name][:server_type] == "build-nodes"
|
399
|
+
next if @server_configs[server.name][:required_products]["chefdk"] && @server_configs[server.name][:required_products].length == 1
|
400
|
+
end
|
400
401
|
install_products(server) unless @server_configs[server.name][:required_products].empty?
|
401
402
|
end
|
402
403
|
servers.each do |server|
|
@@ -493,6 +494,9 @@ module DevLXC
|
|
493
494
|
if !force && !server.snapshot_list.select { |sn| sn[2].start_with?("dev-lxc build: products installed") }.empty?
|
494
495
|
# Skipping product cache preparation for container because it has a 'products installed' snapshot
|
495
496
|
next
|
497
|
+
elsif !force && !server.snapshot_list.select { |sn| sn[2].start_with?("dev-lxc build: completed") }.empty?
|
498
|
+
# Skipping product cache preparation for container because it has a 'build: completed' snapshot
|
499
|
+
next
|
496
500
|
end
|
497
501
|
products.each do |product_name, product_options|
|
498
502
|
if product_options && product_options['package_source']
|
@@ -531,6 +535,9 @@ module DevLXC
|
|
531
535
|
if !server.snapshot_list.select { |sn| sn[2].start_with?("dev-lxc build: products installed") }.empty?
|
532
536
|
puts "Skipping product installation for container '#{server.name}' because it already has a 'products installed' snapshot"
|
533
537
|
return
|
538
|
+
elsif !server.snapshot_list.select { |sn| sn[2].start_with?("dev-lxc build: completed") }.empty?
|
539
|
+
puts "Skipping product installation for container '#{server.name}' because it already has a 'build: completed' snapshot"
|
540
|
+
return
|
534
541
|
end
|
535
542
|
if server.container.running?
|
536
543
|
server_was_running = true
|
data/lib/dev-lxc/version.rb
CHANGED