docker-armada 2.0.53 → 2.0.58
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +20 -7
- data/{armada.gemspec → docker-armada.gemspec} +8 -8
- data/lib/armada/deploy_dsl.rb +4 -0
- data/lib/armada/docker/container.rb +1 -0
- metadata +35 -35
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: cd98454d3f94c1d1c61ab249c7fbe2ca9d9a73b8
|
4
|
+
data.tar.gz: 61a86f0d790bb82bf3fb25b877fcabb04dbfef3f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9f086fbf81a94f1c5170e1f77e7f03ae8c45e45473a063fffc38707ecbb6bdd36d83c3bbbad3c6f0cf14fdde3d8b2b4798894ea0ceff95a8a1362d855e437c37
|
7
|
+
data.tar.gz: b947ca57180dbf47d432782e7955fec9fefc59449f23ba9ad144b435d1d1c9e8ae9a6d250c85214d4c295fce2d915c6e2dcb24e143b1f35680c2c6598db54770
|
data/README.md
CHANGED
@@ -1,4 +1,6 @@
|
|
1
1
|
[](https://travis-ci.org/RallySoftware/armada)
|
2
|
+
[](http://badge.fury.io/rb/docker-armada)
|
3
|
+
[](http://waffle.io/RallySoftware/armada)
|
2
4
|
|
3
5
|
|
4
6
|
## Description
|
@@ -11,7 +13,7 @@ This gem is used in production for deployments at Rally Software. We like the st
|
|
11
13
|
## Installation
|
12
14
|
|
13
15
|
```
|
14
|
-
$ gem install armada
|
16
|
+
$ gem install docker-armada
|
15
17
|
```
|
16
18
|
|
17
19
|
## Writing your service descriptor
|
@@ -126,25 +128,36 @@ restart_policy { "Name" => "always" }
|
|
126
128
|
restart_policy { "Name" => "on-failure", "MaximumRetryCount" => 5 }
|
127
129
|
```
|
128
130
|
|
131
|
+
#### Privileged containers
|
132
|
+
If you would like to have your container run in privileged mode just specify the following:
|
133
|
+
|
134
|
+
```ruby
|
135
|
+
privileged
|
136
|
+
```
|
137
|
+
|
129
138
|
#### Setting other descriptor values
|
130
139
|
Some configuration options are not set using a DSL method. Instead you must call the `set` method. The current list of these options are:
|
131
140
|
|
132
141
|
```ruby
|
133
142
|
set :image, 'quay.io/myorg/myservice'
|
134
143
|
set :tag, '0.1.0'
|
135
|
-
set :health_check_endpoint, '/_metrics/healthcheck'
|
136
|
-
set :health_check_port, 3100
|
137
|
-
set :health_check_retries, 60 #number of times to check if the container is up and healthy
|
138
|
-
set :health_check_delay, 1 #number of seconds to wait between each retry
|
139
144
|
```
|
145
|
+
|
146
|
+
#### Health Checks
|
147
|
+
Armada can perform a http health check for your application. There are 4 pieces of information you can specify as part of a health check.
|
148
|
+
|
149
|
+
* `health_check_endpoint` - Can be any end point that returns a status 200. Default:`/`
|
150
|
+
* `health_check_port` - This should be the port exposed by the container that the health check is listening on. **Not the host mapped value**
|
151
|
+
* `health_check_retries` - The number of times we will retry issuing a health check. Default:`60`
|
152
|
+
* `health_check_delay` - The number of seconds to wait between health check retries. Default:`1`
|
153
|
+
|
140
154
|
**health_check_port will work even if you do not specify a contianer -> host port mapping. Armada will determine the dynamically assigned port to the expected container health check port and use that when performing the health check.**
|
141
155
|
|
142
156
|
#### Raw Container Config
|
143
157
|
If you want to use a docker feature not yet exposed through the armadafile, you can include a raw container config, and the rest of the armadafile will be applied on top of it.
|
144
158
|
|
145
159
|
```ruby
|
146
|
-
container_config
|
147
|
-
container_config { "Privileged" => false }
|
160
|
+
container_config({ "Cmd" => [ "date" ] })
|
148
161
|
```
|
149
162
|
|
150
163
|
## CLI
|
@@ -18,20 +18,20 @@ Gem::Specification.new do |spec|
|
|
18
18
|
spec.require_paths = ['lib']
|
19
19
|
|
20
20
|
spec.add_dependency 'excon', '~> 0.33'
|
21
|
-
spec.add_dependency 'net-ssh'
|
22
|
-
spec.add_dependency 'net-ssh-gateway'
|
21
|
+
spec.add_dependency 'net-ssh', '~> 2.9'
|
22
|
+
spec.add_dependency 'net-ssh-gateway', '~> 1.2'
|
23
23
|
spec.add_dependency 'docker-api', '~> 1.13'
|
24
24
|
spec.add_dependency 'thor', '~> 0.19'
|
25
|
-
spec.add_dependency 'awesome_print'
|
26
|
-
spec.add_dependency 'table_print'
|
27
|
-
spec.add_dependency 'conjur-cli'
|
25
|
+
spec.add_dependency 'awesome_print', '~> 1.2'
|
26
|
+
spec.add_dependency 'table_print', '~> 1.5'
|
27
|
+
spec.add_dependency 'conjur-cli', '~> 4.17'
|
28
28
|
|
29
|
-
spec.add_development_dependency 'bundler'
|
30
|
-
spec.add_development_dependency 'rake'
|
29
|
+
spec.add_development_dependency 'bundler', '~> 1.7'
|
30
|
+
spec.add_development_dependency 'rake', '~> 10.3'
|
31
31
|
spec.add_development_dependency 'rspec', '~> 2.14.0'
|
32
32
|
spec.add_development_dependency 'thor-scmversion', '< 1.6.0'
|
33
33
|
spec.add_development_dependency 'geminabox', '~> 0.10'
|
34
|
-
spec.add_development_dependency 'webmock'
|
34
|
+
spec.add_development_dependency 'webmock', '~> 1.19'
|
35
35
|
|
36
36
|
spec.required_ruby_version = '>= 1.9.3'
|
37
37
|
end
|
data/lib/armada/deploy_dsl.rb
CHANGED
@@ -59,6 +59,7 @@ module Armada
|
|
59
59
|
host_config['Binds'] = options[:binds] if options[:binds] && !options[:binds].empty?
|
60
60
|
host_config['PortBindings'] = options[:port_bindings] if options[:port_bindings]
|
61
61
|
host_config['PublishAllPorts'] = true
|
62
|
+
host_config['Privileged'] = options[:privileged] || false
|
62
63
|
host_config
|
63
64
|
end
|
64
65
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: docker-armada
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.58
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jonathan Chauncey
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2014-11-
|
13
|
+
date: 2014-11-18 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: excon
|
@@ -30,30 +30,30 @@ dependencies:
|
|
30
30
|
name: net-ssh
|
31
31
|
requirement: !ruby/object:Gem::Requirement
|
32
32
|
requirements:
|
33
|
-
- - "
|
33
|
+
- - "~>"
|
34
34
|
- !ruby/object:Gem::Version
|
35
|
-
version: '
|
35
|
+
version: '2.9'
|
36
36
|
type: :runtime
|
37
37
|
prerelease: false
|
38
38
|
version_requirements: !ruby/object:Gem::Requirement
|
39
39
|
requirements:
|
40
|
-
- - "
|
40
|
+
- - "~>"
|
41
41
|
- !ruby/object:Gem::Version
|
42
|
-
version: '
|
42
|
+
version: '2.9'
|
43
43
|
- !ruby/object:Gem::Dependency
|
44
44
|
name: net-ssh-gateway
|
45
45
|
requirement: !ruby/object:Gem::Requirement
|
46
46
|
requirements:
|
47
|
-
- - "
|
47
|
+
- - "~>"
|
48
48
|
- !ruby/object:Gem::Version
|
49
|
-
version: '
|
49
|
+
version: '1.2'
|
50
50
|
type: :runtime
|
51
51
|
prerelease: false
|
52
52
|
version_requirements: !ruby/object:Gem::Requirement
|
53
53
|
requirements:
|
54
|
-
- - "
|
54
|
+
- - "~>"
|
55
55
|
- !ruby/object:Gem::Version
|
56
|
-
version: '
|
56
|
+
version: '1.2'
|
57
57
|
- !ruby/object:Gem::Dependency
|
58
58
|
name: docker-api
|
59
59
|
requirement: !ruby/object:Gem::Requirement
|
@@ -86,72 +86,72 @@ dependencies:
|
|
86
86
|
name: awesome_print
|
87
87
|
requirement: !ruby/object:Gem::Requirement
|
88
88
|
requirements:
|
89
|
-
- - "
|
89
|
+
- - "~>"
|
90
90
|
- !ruby/object:Gem::Version
|
91
|
-
version: '
|
91
|
+
version: '1.2'
|
92
92
|
type: :runtime
|
93
93
|
prerelease: false
|
94
94
|
version_requirements: !ruby/object:Gem::Requirement
|
95
95
|
requirements:
|
96
|
-
- - "
|
96
|
+
- - "~>"
|
97
97
|
- !ruby/object:Gem::Version
|
98
|
-
version: '
|
98
|
+
version: '1.2'
|
99
99
|
- !ruby/object:Gem::Dependency
|
100
100
|
name: table_print
|
101
101
|
requirement: !ruby/object:Gem::Requirement
|
102
102
|
requirements:
|
103
|
-
- - "
|
103
|
+
- - "~>"
|
104
104
|
- !ruby/object:Gem::Version
|
105
|
-
version: '
|
105
|
+
version: '1.5'
|
106
106
|
type: :runtime
|
107
107
|
prerelease: false
|
108
108
|
version_requirements: !ruby/object:Gem::Requirement
|
109
109
|
requirements:
|
110
|
-
- - "
|
110
|
+
- - "~>"
|
111
111
|
- !ruby/object:Gem::Version
|
112
|
-
version: '
|
112
|
+
version: '1.5'
|
113
113
|
- !ruby/object:Gem::Dependency
|
114
114
|
name: conjur-cli
|
115
115
|
requirement: !ruby/object:Gem::Requirement
|
116
116
|
requirements:
|
117
|
-
- - "
|
117
|
+
- - "~>"
|
118
118
|
- !ruby/object:Gem::Version
|
119
|
-
version: '
|
119
|
+
version: '4.17'
|
120
120
|
type: :runtime
|
121
121
|
prerelease: false
|
122
122
|
version_requirements: !ruby/object:Gem::Requirement
|
123
123
|
requirements:
|
124
|
-
- - "
|
124
|
+
- - "~>"
|
125
125
|
- !ruby/object:Gem::Version
|
126
|
-
version: '
|
126
|
+
version: '4.17'
|
127
127
|
- !ruby/object:Gem::Dependency
|
128
128
|
name: bundler
|
129
129
|
requirement: !ruby/object:Gem::Requirement
|
130
130
|
requirements:
|
131
|
-
- - "
|
131
|
+
- - "~>"
|
132
132
|
- !ruby/object:Gem::Version
|
133
|
-
version: '
|
133
|
+
version: '1.7'
|
134
134
|
type: :development
|
135
135
|
prerelease: false
|
136
136
|
version_requirements: !ruby/object:Gem::Requirement
|
137
137
|
requirements:
|
138
|
-
- - "
|
138
|
+
- - "~>"
|
139
139
|
- !ruby/object:Gem::Version
|
140
|
-
version: '
|
140
|
+
version: '1.7'
|
141
141
|
- !ruby/object:Gem::Dependency
|
142
142
|
name: rake
|
143
143
|
requirement: !ruby/object:Gem::Requirement
|
144
144
|
requirements:
|
145
|
-
- - "
|
145
|
+
- - "~>"
|
146
146
|
- !ruby/object:Gem::Version
|
147
|
-
version: '
|
147
|
+
version: '10.3'
|
148
148
|
type: :development
|
149
149
|
prerelease: false
|
150
150
|
version_requirements: !ruby/object:Gem::Requirement
|
151
151
|
requirements:
|
152
|
-
- - "
|
152
|
+
- - "~>"
|
153
153
|
- !ruby/object:Gem::Version
|
154
|
-
version: '
|
154
|
+
version: '10.3'
|
155
155
|
- !ruby/object:Gem::Dependency
|
156
156
|
name: rspec
|
157
157
|
requirement: !ruby/object:Gem::Requirement
|
@@ -198,16 +198,16 @@ dependencies:
|
|
198
198
|
name: webmock
|
199
199
|
requirement: !ruby/object:Gem::Requirement
|
200
200
|
requirements:
|
201
|
-
- - "
|
201
|
+
- - "~>"
|
202
202
|
- !ruby/object:Gem::Version
|
203
|
-
version: '
|
203
|
+
version: '1.19'
|
204
204
|
type: :development
|
205
205
|
prerelease: false
|
206
206
|
version_requirements: !ruby/object:Gem::Requirement
|
207
207
|
requirements:
|
208
|
-
- - "
|
208
|
+
- - "~>"
|
209
209
|
- !ruby/object:Gem::Version
|
210
|
-
version: '
|
210
|
+
version: '1.19'
|
211
211
|
description: Deploy utility for docker containers
|
212
212
|
email:
|
213
213
|
executables:
|
@@ -222,8 +222,8 @@ files:
|
|
222
222
|
- README.md
|
223
223
|
- Rakefile
|
224
224
|
- Thorfile
|
225
|
-
- armada.gemspec
|
226
225
|
- bin/armada
|
226
|
+
- docker-armada.gemspec
|
227
227
|
- lib/armada.rb
|
228
228
|
- lib/armada/clean.rb
|
229
229
|
- lib/armada/clean/containers.rb
|