docker-builder 0.1.21 → 0.1.22
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/docker_builder/manager_swarm.rb +2 -2
- data/lib/docker_builder/server_settings.rb +17 -5
- data/lib/docker_builder/version.rb +1 -1
- data/readme.md +28 -0
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 75d96d38619580c04a14f9882ac3ee0293f00b85
|
4
|
+
data.tar.gz: 91260ad7501c8af414ce899b6335bf723f9d83ea
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c4fd0710fc71c5628b25179860a822e500d559daa82efceda1e171d662fdd5dddf1bff8f035ae15e07617455b944a499e980eb59992dc58689b79b0a184f2a27
|
7
|
+
data.tar.gz: 8663e64e2737860cac04dff03d6bf1ab44787e32c7e9c00451e4d6bd4b794468fc6d8ff74291729158933d454222a072a5a56ede09348bc995bc08d724577844
|
@@ -5,7 +5,7 @@ module DockerBuilder
|
|
5
5
|
puts "destroying service #{server_name}..."
|
6
6
|
|
7
7
|
#
|
8
|
-
cmd %Q(docker service rm #{settings.
|
8
|
+
cmd %Q(docker service rm #{settings.service_name} )
|
9
9
|
|
10
10
|
#
|
11
11
|
return true
|
@@ -35,7 +35,7 @@ module DockerBuilder
|
|
35
35
|
run_opts << docker_opts['swarm_options']
|
36
36
|
|
37
37
|
cmd %Q(docker service create \
|
38
|
-
--name #{settings.
|
38
|
+
--name #{settings.service_name} \
|
39
39
|
#{run_opts.join(' ')} \
|
40
40
|
#{settings.image_name} #{settings['docker']['command']}
|
41
41
|
)
|
@@ -57,6 +57,18 @@ class ServerSettings
|
|
57
57
|
attributes['common']['prefix']
|
58
58
|
end
|
59
59
|
|
60
|
+
def container_prefix
|
61
|
+
"#{attributes['common']['prefix']}#{attributes['common']['container_prefix']}"
|
62
|
+
end
|
63
|
+
|
64
|
+
def image_prefix
|
65
|
+
"#{attributes['common']['prefix']}#{attributes['common']['image_prefix']}"
|
66
|
+
end
|
67
|
+
|
68
|
+
def service_prefix
|
69
|
+
"#{attributes['common']['prefix']}#{attributes['common']['service_prefix']}"
|
70
|
+
end
|
71
|
+
|
60
72
|
|
61
73
|
###
|
62
74
|
|
@@ -76,10 +88,10 @@ class ServerSettings
|
|
76
88
|
|
77
89
|
#
|
78
90
|
if attributes['build']['image_name']
|
79
|
-
|
91
|
+
s = "#{attributes['build']['image_name']}"
|
80
92
|
end
|
81
93
|
|
82
|
-
"#{
|
94
|
+
"#{image_prefix}#{s}"
|
83
95
|
end
|
84
96
|
|
85
97
|
def need_build?
|
@@ -94,11 +106,11 @@ class ServerSettings
|
|
94
106
|
name ||= attributes['name']
|
95
107
|
s = name
|
96
108
|
|
97
|
-
"#{
|
109
|
+
"#{container_prefix}#{s}"
|
98
110
|
end
|
99
111
|
|
100
112
|
def chef_node_name
|
101
|
-
"#{
|
113
|
+
"#{prefix}#{name}"
|
102
114
|
end
|
103
115
|
|
104
116
|
def volume_path_local(v)
|
@@ -188,7 +200,7 @@ class ServerSettings
|
|
188
200
|
|
189
201
|
# fix
|
190
202
|
res = a.map do |r|
|
191
|
-
["#{
|
203
|
+
["#{container_prefix}#{r[0]}", r[1]]
|
192
204
|
end
|
193
205
|
|
194
206
|
res
|
data/readme.md
CHANGED
@@ -507,3 +507,31 @@ docker: {
|
|
507
507
|
* swarm_network - network name
|
508
508
|
* swarm_options - options to pass to docker service create command
|
509
509
|
|
510
|
+
|
511
|
+
|
512
|
+
# Options
|
513
|
+
|
514
|
+
## prefix
|
515
|
+
|
516
|
+
prefix for image names, container names, and service names (for swarm mode)
|
517
|
+
|
518
|
+
* prefix - common prefix. Added to all names
|
519
|
+
* container_prefix - prefix for containers
|
520
|
+
* image_prefix - prefix for images
|
521
|
+
* service_prefix - prefix for services
|
522
|
+
|
523
|
+
|
524
|
+
Example:
|
525
|
+
* container name = $prefix$container_prefix$name
|
526
|
+
|
527
|
+
```
|
528
|
+
prefix='my-'
|
529
|
+
container_prefix='test-'
|
530
|
+
|
531
|
+
container name will be like
|
532
|
+
my-test-redis
|
533
|
+
|
534
|
+
```
|
535
|
+
|
536
|
+
|
537
|
+
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: docker-builder
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.22
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Max Ivak
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-01-
|
11
|
+
date: 2017-01-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|