puppet_docker_tools 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83418018be00481fd020d44eb91dc3e91cbe64d9
-  data.tar.gz: 981bd7c153e5cfec42bf8f97bc6e791278d76dd8
+  metadata.gz: d9a052ffa04d431161f3d63267430416c2857234
+  data.tar.gz: bad61b2a4a18d434760e620c7dfe3fe531f63a1d
 SHA512:
-  metadata.gz: 27d23f46ffe35d28e41e5fe9c66493d35eadcfde6adfc97b55ad01159f517b6052e769a99f3da9428b0405a5b533d972856160a5bb55c26902d2017eae594d26
-  data.tar.gz: 18f9ec6d818748ec65ebb58142b9b65832259d679211f8d2a0a0761548b73be7e9c903f5a40a92945cfde5c8f5402e5eb56e4e2f04c99041bf2cc228c4a603e4
+  metadata.gz: ab37a2fc5f60e35a88dd59a447c72d45d461083a77edda97a868c6d02abe519565b994e5925f1b3d6cb6599e0d2a0c279e07b166c2919bca6fc07cdf94361ef0
+  data.tar.gz: bc64d63f6cd8bc8285021b1746057a7236c9669217559517044e2016d23ec11fe4ae14faf8355a332b5293c90dd849d3adc57dbd3cf80f17f7c27c510c6a4833

data/README.md

@@ -15,11 +15,11 @@ $ puppet-docker help
 Utilities for building and releasing Puppet docker images.
 
 Usage:
-  puppet-docker build [DIRECTORY] [--dockerfile=<dockerfile>] [--repository=<repo>] [--namespace=<namespace>] [--no-cache] [--version=<version] [--build-arg=<buildarg> ...] [--no-latest]
+  puppet-docker build [DIRECTORY] [--dockerfile=<dockerfile>] [--repository=<repo>] [--namespace=<namespace>] [--no-cache] [--version=<version>] [--build-arg=<buildarg> ...] [--no-latest]
   puppet-docker lint [DIRECTORY] [--dockerfile=<dockerfile>]
   puppet-docker local-lint [DIRECTORY] [--dockerfile=<dockerfile>]
   puppet-docker pull [IMAGE] [--repository=<repo>]
-  puppet-docker push [DIRECTORY] [--dockerfile=<dockerfile>] [--repository=<repo>] [--namespace=<namespace>] [--no-latest]
+  puppet-docker push [DIRECTORY] [--dockerfile=<dockerfile>] [--repository=<repo>] [--namespace=<namespace>] [--version=<version>] [--no-latest]
   puppet-docker rev-labels [DIRECTORY] [--dockerfile=<dockerfile>] [--namespace=<namespace>]
   puppet-docker spec [DIRECTORY]
   puppet-docker test [DIRECTORY] [--dockerfile=<dockerfile>]
@@ -33,15 +33,14 @@ Arguments:
   TAG        Pull latest versions of images at TAG. Defaults to ['ubuntu:16.04', 'centos:7', 'alpine:3.4', 'debian:9', 'postgres:9.6.8']
 
 Options:
-  --repository=<repo>        Dockerhub repository containing the image [default: puppet]
+  --repository=<repo>        Docker repository containing the image [default: puppet]
   --no-cache                 Disable use of layer cache when building this image. Defaults to using the cache.
   --namespace=<namespace>    Namespace for labels on the container [default: org.label-schema]
   --dockerfile=<dockerfile>  File name for your dockerfile [default: Dockerfile]
   --version=<version>        Version to build. This field will be used to determine the label and will be passed as the version build arg.
                              **NOTE** `--build-arg version='<version>'` overrides `--version <version>`
   --build-arg=<buildarg>     Build arg to pass to container build, can be passed multiple times.
-  --no-latest                Do not include the 'latest' tag when building and shipping images. By default, the 'latest' tag is built and
-                             shipped with the versioned tag.
+  --no-latest                Do not include the 'latest' tag when building and shipping images. By default, the 'latest' tag is built and shipped with the versioned tag.
 ```
 
 ### `puppet-docker build`
@@ -66,7 +65,7 @@ Pull the specified image, i.e. 'puppet/puppetserver'. *NOTE*: If you don't inclu
 
 ### `puppet-docker push`
 
-Push images built from the dockerfile in DIRECTORY to hub.docker.com. This task will fail if you do not have a version specified in your dockerfile. It will push both a versioned and a 'latest' tagged image.
+Push images built from the dockerfile in DIRECTORY to <repo>. This task will fail if you do not have a version specified in your dockerfile. It will push both a versioned and a 'latest' tagged image.
 
 ### `puppet-docker rev-labels`
 

data/bin/puppet-docker

@@ -7,11 +7,11 @@ doc = <<DOC
 Utilities for building and releasing Puppet docker images.
 
 Usage:
-  puppet-docker build [DIRECTORY] [--dockerfile=<dockerfile>] [--repository=<repo>] [--namespace=<namespace>] [--no-cache] [--version=<version] [--build-arg=<buildarg> ...] [--no-latest]
+  puppet-docker build [DIRECTORY] [--dockerfile=<dockerfile>] [--repository=<repo>] [--namespace=<namespace>] [--no-cache] [--version=<version>] [--build-arg=<buildarg> ...] [--no-latest]
   puppet-docker lint [DIRECTORY] [--dockerfile=<dockerfile>]
   puppet-docker local-lint [DIRECTORY] [--dockerfile=<dockerfile>]
   puppet-docker pull [IMAGE] [--repository=<repo>]
-  puppet-docker push [DIRECTORY] [--dockerfile=<dockerfile>] [--repository=<repo>] [--namespace=<namespace>] [--no-latest]
+  puppet-docker push [DIRECTORY] [--dockerfile=<dockerfile>] [--repository=<repo>] [--namespace=<namespace>] [--version=<version>] [--no-latest]
   puppet-docker rev-labels [DIRECTORY] [--dockerfile=<dockerfile>] [--namespace=<namespace>]
   puppet-docker spec [DIRECTORY]
   puppet-docker test [DIRECTORY] [--dockerfile=<dockerfile>]
@@ -25,15 +25,14 @@ Arguments:
   TAG        Pull latest versions of images at TAG. Defaults to ['ubuntu:16.04', 'centos:7', 'alpine:3.4', 'debian:9', 'postgres:9.6.8']
 
 Options:
-  --repository=<repo>        Dockerhub repository containing the image [default: puppet]
+  --repository=<repo>        Docker repository containing the image [default: puppet]
   --no-cache                 Disable use of layer cache when building this image. Defaults to using the cache.
   --namespace=<namespace>    Namespace for labels on the container [default: org.label-schema]
   --dockerfile=<dockerfile>  File name for your dockerfile [default: Dockerfile]
   --version=<version>        Version to build. This field will be used to determine the label and will be passed as the version build arg.
                              **NOTE** `--build-arg version='<version>'` overrides `--version <version>`
   --build-arg=<buildarg>     Build arg to pass to container build, can be passed multiple times.
-  --no-latest                Do not include the 'latest' tag when building and shipping images. By default, the 'latest' tag is built and
-                             shipped with the versioned tag.
+  --no-latest                Do not include the 'latest' tag when building and shipping images. By default, the 'latest' tag is built and shipped with the versioned tag.
 DOC
 
 begin
@@ -88,7 +87,7 @@ begin
     elsif options['local-lint']
       command_runner.local_lint
     elsif options['push']
-      command_runner.push(latest: latest)
+      command_runner.push(latest: latest, version: options['--version'])
     elsif options['rev-labels']
       command_runner.rev_labels
     elsif options['spec']

data/lib/puppet_docker_tools/runner.rb

@@ -114,31 +114,35 @@ class PuppetDockerTools
       fail output unless status == 0
     end
 
-    # Push an image to hub.docker.com
+    # Push an image to $repository
     #
     # @param latest Whether or not to push the latest tag along with the
     #        versioned image build.
-    def push(latest: true)
+    def push(latest: true, version: nil)
       image_name = File.basename(directory)
       path = "#{repository}/#{image_name}"
-      version = PuppetDockerTools::Utilities.get_value_from_label(path, value: 'version', namespace: namespace)
 
-      # We always want to push a versioned label
+      # only check for version from the label if we didn't pass it in
+      if version.nil?
+        version = PuppetDockerTools::Utilities.get_value_from_label(path, value: 'version', namespace: namespace)
+      end
+
+      # We always want to push a versioned container
       unless version
         fail "No version specified in #{dockerfile} for #{path}"
       end
 
-      puts "Pushing #{path}:#{version} to Docker Hub"
-      exitstatus, _ = PuppetDockerTools::Utilities.push_to_dockerhub("#{path}:#{version}")
+      puts "Pushing #{path}:#{version}"
+      exitstatus, _ = PuppetDockerTools::Utilities.push_to_docker_repo("#{path}:#{version}")
       unless exitstatus == 0
-        fail "Pushing #{path}:#{version} to dockerhub failed!"
+        fail "Pushing #{path}:#{version} failed!"
       end
 
       if latest
-        puts "Pushing #{path}:latest to Docker Hub"
-        exitstatus, _ = PuppetDockerTools::Utilities.push_to_dockerhub("#{path}:latest")
+        puts "Pushing #{path}:latest"
+        exitstatus, _ = PuppetDockerTools::Utilities.push_to_docker_repo("#{path}:latest")
         unless exitstatus == 0
-          fail "Pushing #{path}:latest to dockerhub failed!"
+          fail "Pushing #{path}:latest failed!"
         end
       end
     end

data/lib/puppet_docker_tools/utilities.rb

@@ -5,14 +5,16 @@ class PuppetDockerTools
   module Utilities
     module_function
 
-    # Push an image to hub.docker.com
+    # Push an image to a docker repository
     #
     # @param image_name The image to push, including the tag e.g., puppet/puppetserver:latest
+    #        If pushing to a private repo, the image name should include the repo endpoint,
+    #        like my-docker-repo.internal.net/puppet/puppetserver:latest
     # @param stream_output Whether or not to stream output as it comes in, defaults to true
     # @return Returns an array containing the integer exitstatus of the push
     #         command and a string containing the combined stdout and stderr
     #         from the push
-    def push_to_dockerhub(image_name, stream_output=true)
+    def push_to_docker_repo(image_name, stream_output=true)
       Open3.popen2e("docker push #{image_name}") do |stdin, output_stream, wait_thread|
         output=''
         while line = output_stream.gets

data/spec/lib/puppet_docker_tools/runner_spec.rb

@@ -147,29 +147,36 @@ describe PuppetDockerTools::Runner do
 
     it 'should raise an error if something bad happens pushing the versioned tag' do
       expect(PuppetDockerTools::Utilities).to receive(:get_value_from_label).with('test/test-image', value: 'version', namespace: runner.namespace).and_return('1.2.3')
-      expect(PuppetDockerTools::Utilities).to receive(:push_to_dockerhub).with('test/test-image:1.2.3').and_return([1, nil])
-      expect { runner.push }.to raise_error(RuntimeError, /1.2.3 to dockerhub/i)
+      expect(PuppetDockerTools::Utilities).to receive(:push_to_docker_repo).with('test/test-image:1.2.3').and_return([1, nil])
+      expect { runner.push }.to raise_error(RuntimeError, /1.2.3 failed/i)
     end
 
     it 'should raise an error if something bad happens pushing the latest tag' do
       expect(PuppetDockerTools::Utilities).to receive(:get_value_from_label).with('test/test-image', value: 'version', namespace: runner.namespace).and_return('1.2.3')
-      expect(PuppetDockerTools::Utilities).to receive(:push_to_dockerhub).with('test/test-image:1.2.3').and_return([0, nil])
-      expect(PuppetDockerTools::Utilities).to receive(:push_to_dockerhub).with('test/test-image:latest').and_return([1, nil])
-      expect { runner.push }.to raise_error(RuntimeError, /latest to dockerhub/i)
+      expect(PuppetDockerTools::Utilities).to receive(:push_to_docker_repo).with('test/test-image:1.2.3').and_return([0, nil])
+      expect(PuppetDockerTools::Utilities).to receive(:push_to_docker_repo).with('test/test-image:latest').and_return([1, nil])
+      expect { runner.push }.to raise_error(RuntimeError, /latest failed/i)
     end
 
     it 'should push the versioned and latest tags if nothing goes wrong' do
       expect(PuppetDockerTools::Utilities).to receive(:get_value_from_label).with('test/test-image', value: 'version', namespace: runner.namespace).and_return('1.2.3')
-      expect(PuppetDockerTools::Utilities).to receive(:push_to_dockerhub).with('test/test-image:1.2.3').and_return([0, nil])
-      expect(PuppetDockerTools::Utilities).to receive(:push_to_dockerhub).with('test/test-image:latest').and_return([0, nil])
+      expect(PuppetDockerTools::Utilities).to receive(:push_to_docker_repo).with('test/test-image:1.2.3').and_return([0, nil])
+      expect(PuppetDockerTools::Utilities).to receive(:push_to_docker_repo).with('test/test-image:latest').and_return([0, nil])
       runner.push
     end
 
     it 'should not push the latest tag if latest is set to false' do
       expect(PuppetDockerTools::Utilities).to receive(:get_value_from_label).with('test/test-image', value: 'version', namespace: runner.namespace).and_return('1.2.3')
-      expect(PuppetDockerTools::Utilities).to receive(:push_to_dockerhub).with('test/test-image:1.2.3').and_return([0, nil])
+      expect(PuppetDockerTools::Utilities).to receive(:push_to_docker_repo).with('test/test-image:1.2.3').and_return([0, nil])
       runner.push(latest: false)
     end
+
+    it "shouldn't look for the version if it's passed" do
+      expect(PuppetDockerTools::Utilities).not_to receive(:get_value_from_label)
+      expect(PuppetDockerTools::Utilities).to receive(:push_to_docker_repo).with('test/test-image:4.5.6').and_return([0, nil])
+      expect(PuppetDockerTools::Utilities).to receive(:push_to_docker_repo).with('test/test-image:latest').and_return([0, nil])
+      runner.push(version: '4.5.6')
+    end
   end
 
   describe '#rev_labels' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_docker_tools
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2018-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api