dockly 2.7.1 → 2.7.2
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.
- data/lib/dockly/docker.rb +1 -1
- data/lib/dockly/version.rb +1 -1
- data/spec/dockly/docker_spec.rb +3 -2
- metadata +2 -2
data/lib/dockly/docker.rb
CHANGED
@@ -169,7 +169,7 @@ class Dockly::Docker
|
|
169
169
|
|
170
170
|
def import_base(docker_tar)
|
171
171
|
repo = "#{name}-base"
|
172
|
-
tag = "dockly-#{Dockly::VERSION}-#{File.basename(
|
172
|
+
tag = "dockly-#{Dockly::VERSION}-#{File.basename(import).split('.').first}"
|
173
173
|
info "looking for imported base image with tag: #{tag}"
|
174
174
|
image = Docker::Image.all.find { |img| img.info['RepoTags'].include?("#{repo}:#{tag}") }
|
175
175
|
if image
|
data/lib/dockly/version.rb
CHANGED
data/spec/dockly/docker_spec.rb
CHANGED
@@ -70,14 +70,15 @@ describe Dockly::Docker do
|
|
70
70
|
let(:container) { Docker::Container.create('Image' => images.last.id, 'Cmd' => ['ls', '-1', '/']) }
|
71
71
|
let(:output) { container.tap(&:start).attach(logs: true) }
|
72
72
|
|
73
|
+
before { subject.import docker_file }
|
74
|
+
|
73
75
|
after do
|
74
76
|
container.tap(&:wait).remove
|
75
|
-
images.last.remove
|
77
|
+
images.last.remove(force: true)
|
76
78
|
end
|
77
79
|
|
78
80
|
# TODO: since we used to run this w/ Vagrant, we put it all together; break it up
|
79
81
|
it 'works' do
|
80
|
-
# it 'docker imports'
|
81
82
|
subject.tag 'my-app'
|
82
83
|
unless File.exist?(docker_file)
|
83
84
|
File.open(docker_file, 'wb') do |file|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dockly
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.7.
|
4
|
+
version: 2.7.2
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2015-07-
|
12
|
+
date: 2015-07-03 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: clamp
|