dockit 1.2.0 → 1.4.0
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/.gitignore +4 -0
- data/Dockerfile +3 -3
- data/Rakefile +1 -1
- data/VERSION +1 -1
- data/lib/dockit/cli.rb +11 -6
- data/lib/dockit/digitalocean.rb +9 -5
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 335814d19b9f36964209e3a50959e0098d372597
|
4
|
+
data.tar.gz: 4aa02282be6cf26cd9c0b03569fa6b78e4a08797
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 50af3aad18d21bae6efd55d7ad25ef9b206187e6b7b94d81f4b7452cc9b992986ce62f5a10c15c559b3966208d8c644cdc6686fffe9c6a0661063167714c6c73
|
7
|
+
data.tar.gz: 0dcede75936d5ea4511ac2ad2a297c1ea0c67c9f1425e49c2f1794505c40dec21c4b1ca432ad1270a5b6bd47fcec6fc3e51fed6203e6ce3a5589ee9ac5686ce9
|
data/.gitignore
CHANGED
data/Dockerfile
CHANGED
@@ -1,7 +1,7 @@
|
|
1
|
-
FROM cybercode/alpine-ruby
|
2
|
-
ENV DOCKER_VERSION=1.
|
1
|
+
FROM cybercode/alpine-ruby:2.2
|
2
|
+
ENV DOCKER_VERSION=1.9.1 BIN=/usr/local/bin/docker
|
3
3
|
|
4
|
-
RUN apk add
|
4
|
+
RUN apk --update add curl ruby-json && curl -sSL -o $BIN \
|
5
5
|
https://get.docker.com/builds/Linux/x86_64/docker-$DOCKER_VERSION \
|
6
6
|
&& chmod +x $BIN && apk del curl
|
7
7
|
|
data/Rakefile
CHANGED
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.
|
1
|
+
1.4.0
|
data/lib/dockit/cli.rb
CHANGED
@@ -172,17 +172,22 @@ class Default < Thor
|
|
172
172
|
say "'repos' not defined in config file. Exiting",:red
|
173
173
|
exit 1
|
174
174
|
end
|
175
|
-
|
175
|
+
path = s.config.get(:repos_path)
|
176
|
+
treeish = unless path.nil? || path.empty?
|
177
|
+
"#{options.branch}:#{path}"
|
178
|
+
else
|
179
|
+
options.branch
|
180
|
+
end
|
176
181
|
say "Exporting in #{Dir.pwd}", :green
|
177
|
-
say "<- #{repos} #{
|
182
|
+
say "<- #{repos} #{treeish}", :green
|
178
183
|
if options.gem
|
179
184
|
# grab the Gemfiles separately for the bundler Dockerfile hack
|
180
185
|
say "-> Gemfiles", :green
|
181
|
-
export(repos, 'gemfile.tar.gz', 'Gemfile*')
|
186
|
+
export(repos, treeish, 'gemfile.tar.gz', 'Gemfile*')
|
182
187
|
end
|
183
188
|
|
184
189
|
say "-> repos.tar.gz", :green
|
185
|
-
export(repos, 'repos.tar.gz')
|
190
|
+
export(repos, treeish, 'repos.tar.gz')
|
186
191
|
|
187
192
|
s.build
|
188
193
|
end
|
@@ -190,8 +195,8 @@ class Default < Thor
|
|
190
195
|
|
191
196
|
private
|
192
197
|
GIT_CMD = 'git archive -o %s --format tar.gz --remote %s %s %s'.freeze
|
193
|
-
def export(repos, archive, args='')
|
194
|
-
cmd = GIT_CMD % [archive, repos,
|
198
|
+
def export(repos, branch, archive, args='')
|
199
|
+
cmd = GIT_CMD % [archive, repos, branch, args]
|
195
200
|
say "#{cmd}\n", :blue if options.debug
|
196
201
|
|
197
202
|
unless system(cmd)
|
data/lib/dockit/digitalocean.rb
CHANGED
@@ -68,22 +68,26 @@ class DO < Thor
|
|
68
68
|
args.each do |k|
|
69
69
|
s = service(k)
|
70
70
|
unless s.image
|
71
|
-
say ".
|
71
|
+
say ". #{k}: No image!", :red
|
72
72
|
next
|
73
73
|
end
|
74
74
|
name = s.config.get(:build, :t)
|
75
|
+
unless name.present?
|
76
|
+
say ". #{k}: not a local build", :red
|
77
|
+
next
|
78
|
+
end
|
75
79
|
id = s.image.id
|
76
|
-
msg = "#{k}
|
80
|
+
msg = "#{k}(#{id[0..11]}[#{name}]):"
|
77
81
|
if ssh(options.remote, options.user,
|
78
82
|
"docker images --no-trunc | grep #{id} > /dev/null")
|
79
|
-
say ".
|
83
|
+
say ". #{msg} exists"
|
80
84
|
else
|
81
85
|
if options.backup
|
82
86
|
tag = "#{k}:#{options.tag}"
|
83
|
-
say "
|
87
|
+
say "#{msg} tagging as #{tag}"
|
84
88
|
ssh(options.remote, options.user, "docker tag #{name} #{tag}")
|
85
89
|
end
|
86
|
-
say "
|
90
|
+
say "#{msg} pushing"
|
87
91
|
ssh(options.remote, options.user, 'docker load', "docker save #{name}")
|
88
92
|
end
|
89
93
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dockit
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.4.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Rick Frankel
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-12-30 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
192
192
|
version: '0'
|
193
193
|
requirements: []
|
194
194
|
rubyforge_project:
|
195
|
-
rubygems_version: 2.
|
195
|
+
rubygems_version: 2.5.1
|
196
196
|
signing_key:
|
197
197
|
specification_version: 4
|
198
198
|
summary: A configuration manager and builder for docker projects.
|