beaker-docker 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a15b0037f264bd2e696038da349f7fc9ab219c7
-  data.tar.gz: a8a4d98c0cc5a0611938607362e334a2dd289d74
+  metadata.gz: 61c733455ecbe5428c46686a20f1b05359a1d041
+  data.tar.gz: d48dc931bf23a9aabd859a8ed76785748ee4741a
 SHA512:
-  metadata.gz: 7af3da434dbbe522bf039ff513c07d113bdb3da709e622bb9de5eba21a7262237b02e2063d42ef580d0dcd31bd2623a30c8fb897959973bc4dc9d1d7d1d4d33b
-  data.tar.gz: 833277de264b0000bda06bdbef7a072d0d53c1ac5dab68f0ba5f81dda2e34ca5a815657551a5dcee3a313e57be711bd4843bcd09cc1e9d85cb53a5a81dcc4784
+  metadata.gz: 9124af34731fff5cbae59a7d17423435c6d402036872e4743360b41200f1dd12094faceb8d1745b0f4480b84e51354d31175cd32302a24cd7ed518d311016a90
+  data.tar.gz: dac7775e11a3df94beb402d0a600cf8e8eff3c2d6e1874390207cb4d3e79316d747c6ed811a587022906909227f884bfc966543875507655e9a4ac4854769206

data/docker.md

@@ -86,6 +86,22 @@ Unless the image configuration changes you might want to keep the Docker image f
     CONFIG:
       type: foss
 
+### Tag a built Docker Image ###
+Tag an image after creation; this allows for subsequent hosts to reference that image for multi-stage builds.
+
+    HOSTS:
+      ubuntu-12-10:
+        platform: ubuntu-12.10-x64
+        dockerfile: path/to/file
+        hypervisor: docker
+        tag: build_host
+      mysecondhost:
+        dockerfile: path/to/file # file references build_host
+        platform: alpine-3.8-x86_64
+        hypervisor: docker
+    CONFIG:
+      type: foss
+
 ### Reuse Docker Image ###
 In case you want to rerun the puppet again on the docker container, you can pass BEAKER_provision=no on the command line to set the env. Add this line in you default.ml file
 

data/lib/beaker-docker/version.rb

@@ -1,3 +1,3 @@
 module BeakerDocker
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/lib/beaker/hypervisor/docker.rb

@@ -90,6 +90,10 @@ module Beaker
                                         { rm: true, buildargs: buildargs_for(host) })
         end
 
+          if host['tag']
+            image.tag({:repo => host['tag']})
+          end
+
         if @docker_type == 'swarm'
           image_name = "#{@registry}/beaker/#{image.id}"
           ret = ::Docker::Image.search(:term => image_name)

data/spec/beaker/hypervisor/docker_spec.rb

@@ -196,6 +196,19 @@ module Beaker
         allow( docker ).to receive(:dockerfile_for)
       end
 
+      context 'when the host has "tag" defined' do
+        before :each do
+          hosts.each do |host|
+            host['tag'] = 'my_tag'
+          end
+        end
+
+        it 'will tag the image with the value of the tag' do
+          expect( image ).to receive(:tag).with({:repo => 'my_tag'}).exactly(3).times
+          docker.provision
+        end
+      end
+
       context 'when the host has "use_image_entry_point" set to true on the host' do
 
         before :each do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-docker
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec