aggkit 0.2.6.8329 → 0.2.7.8356
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/README.md +2 -2
- data/bin/agglock +1 -1
- data/lib/aggkit/ci.rb +2 -2
- data/lib/aggkit/runner.rb +1 -1
- data/lib/aggkit/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: 78868a3a2110568dd024041051bf5fbeef7988f9
|
4
|
+
data.tar.gz: 27cf9ca6792c156ab43613c32b0bb10dcb96b713
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7985d52d82f75860a4cb474d834ee2689e3671f8200c74264e2b3642ba0240b868784e871a82c21ed144127b981857e36bc1e28d192f8f93d55c09fa84c36d3b
|
7
|
+
data.tar.gz: b55b3e2e17a3d405ef8beca0a4e156c25567b3fe90dad4d8ae57aede83855d3bf040ec043e32290cff1315ccae0d411996a844aa50df3409d5d65c82896294dd
|
data/Gemfile.lock
CHANGED
data/README.md
CHANGED
@@ -88,9 +88,9 @@ srv2:
|
|
88
88
|
value: consul://services/env/srv1/ca_cert
|
89
89
|
```
|
90
90
|
|
91
|
-
###
|
91
|
+
### aggmerge
|
92
92
|
|
93
93
|
Merge docker-compose file of any version. Allow inheritance and extending services.
|
94
94
|
```bash
|
95
|
-
COMPOSE_FILE=file1.yml:file2.yml
|
95
|
+
COMPOSE_FILE=file1.yml:file2.yml aggmerge > /tmp/result.yml
|
96
96
|
```
|
data/bin/agglock
CHANGED
@@ -10,7 +10,7 @@ require 'diplomat'
|
|
10
10
|
}
|
11
11
|
|
12
12
|
parser = OptionParser.new do |o|
|
13
|
-
o.banner = 'Usage:
|
13
|
+
o.banner = 'Usage: agglock [options]'
|
14
14
|
|
15
15
|
o.on("--consul url=#{@opts[:url]}", 'Set up a custom Consul URL') do |url|
|
16
16
|
Diplomat.configure do |config|
|
data/lib/aggkit/ci.rb
CHANGED
@@ -222,8 +222,8 @@ module Aggkit
|
|
222
222
|
puts "CONSULT ID: #{consul}"
|
223
223
|
|
224
224
|
if !config_file.empty?
|
225
|
-
execute("docker exec -i #{consul}
|
226
|
-
execute("docker exec -i #{consul}
|
225
|
+
execute("docker exec -i #{consul} aggwait -t 20 --consul")
|
226
|
+
execute("docker exec -i #{consul} aggconsul --init --override --config - < #{config_file}")
|
227
227
|
end
|
228
228
|
|
229
229
|
execute('docker-compose up -d')
|
data/lib/aggkit/runner.rb
CHANGED
@@ -35,7 +35,7 @@ module Aggkit
|
|
35
35
|
end
|
36
36
|
|
37
37
|
def load_envs_from_consul(consul, service)
|
38
|
-
envs = execute!("
|
38
|
+
envs = execute!("aggconsul --consul=http://#{consul}:8500 --env services/env/#{service} --pristine -d", "Can't load envs")
|
39
39
|
load_envs(envs)
|
40
40
|
end
|
41
41
|
|
data/lib/aggkit/version.rb
CHANGED