puppet_docker_tools 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9a052ffa04d431161f3d63267430416c2857234
-  data.tar.gz: bad61b2a4a18d434760e620c7dfe3fe531f63a1d
+  metadata.gz: 9b6627e1ff33d2a5c6b9f302ad8268f3206f083b
+  data.tar.gz: 135420d71d73f036a552fa4619fbf0d7ac02b435
 SHA512:
-  metadata.gz: ab37a2fc5f60e35a88dd59a447c72d45d461083a77edda97a868c6d02abe519565b994e5925f1b3d6cb6599e0d2a0c279e07b166c2919bca6fc07cdf94361ef0
-  data.tar.gz: bc64d63f6cd8bc8285021b1746057a7236c9669217559517044e2016d23ec11fe4ae14faf8355a332b5293c90dd849d3adc57dbd3cf80f17f7c27c510c6a4833
+  metadata.gz: 291b7624f5478dd96a4e29be0516202ae01f453c1af520db31331b020b4a26b130ac542aa4ed7971e8d503f4cc8365a56ef8297c474236ab5dcb93ee3351f0a9
+  data.tar.gz: ddc9c5af3e64adfd1a5cb2ddb48bb07c07fa9534beb18fb4a837557054a717cb3de3b3fef893531eb072aa96df1e840e5efe4c2d8e4860762936ba14d8d66ef3

data/README.md

@@ -21,7 +21,7 @@ Usage:
   puppet-docker pull [IMAGE] [--repository=<repo>]
   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 spec [DIRECTORY] [--image=<image>]
   puppet-docker test [DIRECTORY] [--dockerfile=<dockerfile>]
   puppet-docker version [DIRECTORY] [--dockerfile=<dockerfile>] [--namespace=<namespace>]
   puppet-docker update-base-images [TAG]...
@@ -39,6 +39,7 @@ Options:
   --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>`
+  --image=<image>            Docker image to use for spec testing
   --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.
 ```

data/bin/puppet-docker

@@ -13,7 +13,7 @@ Usage:
   puppet-docker pull [IMAGE] [--repository=<repo>]
   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 spec [DIRECTORY] [--image=<image>]
   puppet-docker test [DIRECTORY] [--dockerfile=<dockerfile>]
   puppet-docker version [DIRECTORY] [--dockerfile=<dockerfile>] [--namespace=<namespace>]
   puppet-docker update-base-images [TAG]...
@@ -31,6 +31,7 @@ Options:
   --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>`
+  --image=<image>            Docker image to use for spec testing
   --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.
 DOC
@@ -39,7 +40,7 @@ begin
   options = Docopt::docopt(doc)
 rescue Docopt::Exit
   puts doc
-  exit
+  exit 1
 end
 
 defaults = {
@@ -51,6 +52,7 @@ defaults = {
   '--version'    => nil,
   '--build-arg'  => [],
   '--no-latest'  => false,
+  '--image'      => nil,
 }
 
 options.merge!(defaults) do |key, option, default|
@@ -91,7 +93,7 @@ begin
     elsif options['rev-labels']
       command_runner.rev_labels
     elsif options['spec']
-      command_runner.spec
+      command_runner.spec(image: options['--image'])
     elsif options['test']
       command_runner.lint
       command_runner.spec

data/lib/puppet_docker_tools/runner.rb

@@ -1,5 +1,4 @@
 require 'date'
-require 'docker'
 require 'json'
 require 'rspec/core'
 require 'time'
@@ -16,7 +15,7 @@ class PuppetDockerTools
       @namespace = namespace
       @dockerfile = dockerfile
 
-      file = "#{directory}/#{dockerfile}"
+      file = File.join(directory, dockerfile)
       fail "File #{file} doesn't exist!" unless File.exist? file
     end
 
@@ -31,7 +30,7 @@ class PuppetDockerTools
     #        'arg=value'.
     # @param latest Whether or not to build the latest tag along with the
     #        versioned image build.
-    def build(no_cache: false, version: nil, build_args: [], latest: true)
+    def build(no_cache: false, version: nil, build_args: [], latest: true, stream_output: true)
       image_name = File.basename(directory)
       build_args_hash = {
         'vcs_ref' => PuppetDockerTools::Utilities.current_git_sha(directory),
@@ -49,7 +48,7 @@ class PuppetDockerTools
         build_args_hash.merge!(PuppetDockerTools::Utilities.parse_build_args(Array(build_args)))
       end
 
-      build_args_hash = PuppetDockerTools::Utilities.filter_build_args(build_args: build_args_hash, dockerfile: "#{directory}/#{dockerfile}")
+      build_args_hash = PuppetDockerTools::Utilities.filter_build_args(build_args: build_args_hash, dockerfile: File.join(directory, dockerfile))
 
       # This variable is meant to be used for building the non-latest tagged build
       # If the version was set via `version` or `build_args`, use that. If not,
@@ -61,29 +60,47 @@ class PuppetDockerTools
       # and versions passed in to the dockerfile with an `ARG`
       version = build_args_hash['version'] || PuppetDockerTools::Utilities.get_value_from_env('version', namespace: namespace, directory: directory, dockerfile: dockerfile)
 
-      path = "#{repository}/#{image_name}"
-
-      build_options = {'dockerfile' => dockerfile, 'buildargs' => "#{build_args_hash.to_json}"}
+      path = File.join(repository, image_name)
 
+      build_options = []
       if no_cache
         puts "Ignoring cache for #{path}"
-        build_options['nocache'] = true
+        build_options << '--no-cache'
       end
 
+      if dockerfile != "Dockerfile"
+        build_options << ['--file', dockerfile]
+      end
+
+      tags = []
       if latest
-        puts "Building #{path}:latest"
+        tags << ['--tag', "#{path}:latest"]
+      end
 
-        # 't' in the build_options sets the tag for the image we're building
-        build_options['t'] = "#{path}:latest"
+      if version
+        tags << ['--tag', "#{path}:#{version}"]
+      end
 
-        Docker::Image.build_from_dir(directory, build_options)
+      if tags.empty?
+        return nil
       end
 
-      if version
-        puts "Building #{path}:#{version}"
 
-        build_options['t'] = "#{path}:#{version}"
-        Docker::Image.build_from_dir(directory, build_options)
+      build_args = []
+      build_args_hash.map{ |k,v| "#{k}=#{v}" }.each do |val|
+        build_args << ['--build-arg', val]
+      end
+
+      build_command = ['docker', 'build', build_args, build_options, tags, directory].flatten
+
+      Open3.popen2e(*build_command) do |stdin, output_stream, wait_thread|
+        output=''
+        output_stream.each_line do |line|
+          stream_output ? (puts line) : (output += line)
+        end
+        exit_status = wait_thread.value.exitstatus
+        puts output unless stream_output
+        fail unless exit_status == 0
       end
     end
 
@@ -96,21 +113,15 @@ class PuppetDockerTools
 
       # make sure we have the container locally
       PuppetDockerTools::Utilities.pull("#{hadolint_container}:latest")
-      container = Docker::Container.create('Cmd' => ['/bin/sh', '-c', "#{PuppetDockerTools::Utilities.get_hadolint_command}"], 'Image' => hadolint_container, 'OpenStdin' => true, 'StdinOnce' => true)
-      # This container.tap startes the container created above, and passes directory/Dockerfile to the container
-      container.tap(&:start).attach(stdin: "#{directory}/#{dockerfile}")
-      # Wait for the run to finish
-      container.wait
-      exit_status = container.json['State']['ExitCode']
-      unless exit_status == 0
-        fail container.logs(stdout: true, stderr: true)
-      end
+      docker_run = ['docker', 'run', '--rm', '-v', "#{File.join(Dir.pwd, directory, dockerfile)}:/Dockerfile:ro", '-i', 'hadolint/hadolint', PuppetDockerTools::Utilities.get_hadolint_command('Dockerfile')].flatten
+      output, status = Open3.capture2e(*docker_run)
+      fail output unless status == 0
     end
 
     # Run hadolint Dockerfile linting using a local hadolint executable. Executable
     # found based on your path.
     def local_lint
-      output, status = Open3.capture2e(PuppetDockerTools::Utilities.get_hadolint_command("#{directory}/#{dockerfile}"))
+      output, status = Open3.capture2e(*PuppetDockerTools::Utilities.get_hadolint_command(File.join(directory,dockerfile)))
       fail output unless status == 0
     end
 
@@ -120,7 +131,7 @@ class PuppetDockerTools
     #        versioned image build.
     def push(latest: true, version: nil)
       image_name = File.basename(directory)
-      path = "#{repository}/#{image_name}"
+      path = File.join(repository, image_name)
 
       # only check for version from the label if we didn't pass it in
       if version.nil?
@@ -169,15 +180,20 @@ class PuppetDockerTools
 
     # Run spec tests
     #
-    def spec
-      tests = Dir.glob("#{directory}/spec/*_spec.rb")
+    def spec(image: nil)
+      if image
+        fail 'Oh no! You have PUPPET_TEST_DOCKER_IMAGE set! Please unset!' if ENV['PUPPET_TEST_DOCKER_IMAGE']
+        ENV['PUPPET_TEST_DOCKER_IMAGE'] = image
+      end
+
+      tests = Dir.glob(File.join(directory,'spec','*_spec.rb'))
       test_files = tests.map { |test| File.basename(test, '.rb') }
 
-      puts "Running RSpec tests from #{File.expand_path("#{directory}/spec")} (#{test_files.join ","}), this may take some time"
+      puts "Running RSpec tests from #{File.expand_path(File.join(directory,'spec'))} (#{test_files.join ","}), this may take some time"
       success = true
       tests.each do |test|
-        Open3.popen2e("rspec spec #{test}") do |stdin, output_stream, wait_thread|
-          while line = output_stream.gets
+        Open3.popen2e('rspec', 'spec', test) do |stdin, output_stream, wait_thread|
+          output_stream.each_line do |line|
             puts line
           end
           exit_status = wait_thread.value.exitstatus
@@ -185,6 +201,10 @@ class PuppetDockerTools
         end
       end
 
+      if image
+        ENV['PUPPET_TEST_DOCKER_IMAGE'] = nil
+      end
+
       fail "Running RSpec tests for #{directory} failed!" unless success
     end
 

data/lib/puppet_docker_tools/spec_helper.rb

@@ -1,8 +1,2 @@
-require 'serverspec'
-require 'docker'
-
-# Travis builds can take time
-Docker.options[:read_timeout] = 7200
-
 # Load any shared examples or context helpers
 Dir[File.join(File.dirname(__FILE__), '..', '..', 'spec', 'support', '**', '*.rb')].sort.each { |f| require f }

data/lib/puppet_docker_tools/utilities.rb

@@ -1,5 +1,5 @@
-require 'docker'
 require 'open3'
+require 'json'
 
 class PuppetDockerTools
   module Utilities
@@ -15,13 +15,10 @@ class PuppetDockerTools
     #         command and a string containing the combined stdout and stderr
     #         from the push
     def push_to_docker_repo(image_name, stream_output=true)
-      Open3.popen2e("docker push #{image_name}") do |stdin, output_stream, wait_thread|
+      Open3.popen2e('docker', 'push', "#{image_name}") do |stdin, output_stream, wait_thread|
         output=''
-        while line = output_stream.gets
-          if stream_output
-            puts line
-          end
-          output += line
+        output_stream.each_line do |line|
+            stream_output ? (puts line) : (output += line)
         end
         exit_status = wait_thread.value.exitstatus
         return exit_status, output
@@ -79,7 +76,8 @@ class PuppetDockerTools
     # @param value The value you want to get from the labels, e.g. 'version'
     # @param namespace The namespace for the value, e.g. 'org.label-schema'
     def get_value_from_label(image, value: , namespace: )
-      labels = Docker::Image.get(image).json["Config"]["Labels"]
+      output, _ = Open3.capture2('docker', 'inspect', '-f', '"{{json .Config.Labels }}"', "#{image}")
+      labels = JSON.parse(output)
       labels["#{namespace}.#{value.tr('_', '-')}"]
     rescue
       nil
@@ -142,40 +140,19 @@ class PuppetDockerTools
     # Pull a docker image
     #
     # @param image The image to pull. If the image does not include the tag to
-    #        pull, it will pull all tags for that image
-    def pull(image)
-      if image.include?(':')
-        puts "Pulling #{image}"
-        PuppetDockerTools::Utilities.pull_single_tag(image)
-      else
-        puts "Pulling all tags for #{image}"
-        PuppetDockerTools::Utilities.pull_all_tags(image)
-      end
-    end
-
-    # Pull all tags for a docker image
-    #
-    # @param image The image to pull, e.g. puppet/puppetserver
-    def pull_all_tags(image)
-      Docker::Image.create('fromImage' => image)
-
-      # Filter through existing tags of that image so we can output what we pulled
-      images = Docker::Image.all('filter' => image)
-      images.each do |img|
-        timestamp = PuppetDockerTools::Utilities.format_timestamp(img.info["Created"])
-        puts "Pulled #{img.info["RepoTags"].join(', ')}, last updated #{timestamp}"
+    #        pull, it will pull the 'latest' tag for that image
+    def pull(image, stream_output = true)
+      Open3.popen2e('docker', 'pull', "#{image}") do |stdin, output_stream, wait_thread|
+        output=''
+        output_stream.each_line do |line|
+            stream_output ? (puts line) : (output += line)
+        end
+        exit_status = wait_thread.value.exitstatus
+        puts output unless stream_output
+        fail unless exit_status == 0
       end
     end
 
-    # Pull a single tag of a docker image
-    #
-    # @param tag The image/tag to pull, e.g. puppet/puppetserver:latest
-    def pull_single_tag(tag)
-      image = Docker::Image.create('fromImage' => tag)
-      timestamp = PuppetDockerTools::Utilities.format_timestamp(image.info["Created"])
-      puts "Pulled #{image.info["RepoTags"].first}, last updated #{timestamp}"
-    end
-
     # Pull the specified tags
     #
     # @param tags [Array] A list of tags to pull, e.g. ['centos:7', 'ubuntu:16.04']
@@ -197,9 +174,12 @@ class PuppetDockerTools
         'DL4000',
         'DL4001',
       ]
-      ignore_string = ignore_rules.map { |x| "--ignore #{x}" }.join(' ')
-
-      "hadolint #{ignore_string} #{file}"
+      hadolint_command = ['hadolint']
+      ignore_rules.each do |rule|
+        hadolint_command << ['--ignore', rule]
+      end
+      hadolint_command << file
+      hadolint_command.flatten
     end
 
     # Get a value from a Dockerfile

data/spec/lib/puppet_docker_tools/runner_spec.rb

@@ -1,6 +1,6 @@
 require 'puppet_docker_tools'
 require 'puppet_docker_tools/runner'
-require 'docker'
+require 'tmpdir'
 
 describe PuppetDockerTools::Runner do
   def create_runner(directory:, repository:, namespace:, dockerfile:)
@@ -32,55 +32,50 @@ describe PuppetDockerTools::Runner do
   end
 
   describe '#build' do
-    let(:image) { double(Docker::Image) }
-
     it 'builds a latest and version tag if version is found' do
       expect(File).to receive(:read).with("#{runner.directory}/#{runner.dockerfile}").and_return(read_dockerfile)
       expect(PuppetDockerTools::Utilities).to receive(:get_value_from_env).with('version', namespace: runner.namespace, directory: runner.directory, dockerfile: runner.dockerfile).and_return('1.2.3')
-      expect(Docker::Image).to receive(:build_from_dir).with(runner.directory, { 't' => 'test/test-image:1.2.3', 'dockerfile' => runner.dockerfile, 'buildargs' => buildargs }).and_return(image)
-      expect(Docker::Image).to receive(:build_from_dir).with(runner.directory, { 't' => 'test/test-image:latest', 'dockerfile' => runner.dockerfile, 'buildargs' => buildargs }).and_return(image)
+      expect(Open3).to receive(:popen2e).with('docker', 'build', '--build-arg', 'vcs_ref=b0c5ead01b6cabdb3f01871bce699be165c3288f', '--build-arg', 'build_date=2018-06-08T17:18:13Z', '--tag', 'test/test-image:latest', '--tag', 'test/test-image:1.2.3', runner.directory)
       runner.build
     end
 
     it 'builds just a latest tag if no version is found' do
       expect(File).to receive(:read).with("#{runner.directory}/#{runner.dockerfile}").and_return(read_dockerfile)
       expect(PuppetDockerTools::Utilities).to receive(:get_value_from_env).with('version', namespace: runner.namespace, directory: runner.directory, dockerfile: runner.dockerfile).and_return(nil)
-      expect(Docker::Image).to receive(:build_from_dir).with(runner.directory, { 't' => 'test/test-image:latest', 'dockerfile' => runner.dockerfile, 'buildargs' => buildargs }).and_return(image)
+      expect(Open3).to receive(:popen2e).with('docker', 'build', '--build-arg', 'vcs_ref=b0c5ead01b6cabdb3f01871bce699be165c3288f', '--build-arg', 'build_date=2018-06-08T17:18:13Z', '--tag', 'test/test-image:latest', runner.directory)
       runner.build
     end
 
     it 'does not build a latest tag if latest is set to false' do
       expect(File).to receive(:read).with("#{runner.directory}/#{runner.dockerfile}").and_return(read_dockerfile)
       expect(PuppetDockerTools::Utilities).to receive(:get_value_from_env).with('version', namespace: runner.namespace, directory: runner.directory, dockerfile: runner.dockerfile).and_return('1.2.3')
-      expect(Docker::Image).to receive(:build_from_dir).with(runner.directory, { 't' => 'test/test-image:1.2.3', 'dockerfile' => runner.dockerfile, 'buildargs' => buildargs }).and_return(image)
+      expect(Open3).to receive(:popen2e).with('docker', 'build', '--build-arg', 'vcs_ref=b0c5ead01b6cabdb3f01871bce699be165c3288f', '--build-arg', 'build_date=2018-06-08T17:18:13Z', '--tag', 'test/test-image:1.2.3', runner.directory)
       runner.build(latest: false)
     end
 
     it 'ignores the cache when that parameter is set' do
       expect(File).to receive(:read).with("#{runner.directory}/#{runner.dockerfile}").and_return(read_dockerfile)
       expect(PuppetDockerTools::Utilities).to receive(:get_value_from_env).with('version', namespace: runner.namespace, directory: runner.directory, dockerfile: runner.dockerfile).and_return(nil)
-      expect(Docker::Image).to receive(:build_from_dir).with(runner.directory, { 't' => 'test/test-image:latest', 'nocache' => true, 'dockerfile' => runner.dockerfile, 'buildargs' => buildargs }).and_return(image)
+      expect(Open3).to receive(:popen2e).with('docker', 'build', '--build-arg', 'vcs_ref=b0c5ead01b6cabdb3f01871bce699be165c3288f', '--build-arg', 'build_date=2018-06-08T17:18:13Z', '--no-cache', '--tag', 'test/test-image:latest', runner.directory)
       runner.build(no_cache: true)
     end
 
     it 'passes the version when that parameter is set' do
       expect(File).to receive(:read).with("#{runner.directory}/#{runner.dockerfile}").and_return(read_dockerfile_with_version)
-      expect(Docker::Image).to receive(:build_from_dir).with(runner.directory, { 't' => 'test/test-image:latest', 'dockerfile' => runner.dockerfile, 'buildargs' => buildargs_with_version }).and_return(image)
-      expect(Docker::Image).to receive(:build_from_dir).with(runner.directory, { 't' => 'test/test-image:1.2.3', 'dockerfile' => runner.dockerfile, 'buildargs' => buildargs_with_version }).and_return(image)
+      expect(Open3).to receive(:popen2e).with('docker', 'build', '--build-arg', 'vcs_ref=b0c5ead01b6cabdb3f01871bce699be165c3288f', '--build-arg', 'build_date=2018-06-08T17:18:13Z', '--build-arg', 'version=1.2.3', '--tag', 'test/test-image:latest', '--tag', 'test/test-image:1.2.3', runner.directory)
       runner.build(version: '1.2.3')
     end
 
     it 'passes arbitrary build args' do
       expect(File).to receive(:read).with("#{runner.directory}/#{runner.dockerfile}").and_return(read_dockerfile_with_arbitrary_args)
       expect(PuppetDockerTools::Utilities).to receive(:get_value_from_env).with('version', namespace: runner.namespace, directory: runner.directory, dockerfile: runner.dockerfile).and_return(nil)
-      expect(Docker::Image).to receive(:build_from_dir).with(runner.directory, { 't' => 'test/test-image:latest', 'dockerfile' => runner.dockerfile, 'buildargs' => extra_buildargs }).and_return(image)
+      expect(Open3).to receive(:popen2e).with('docker', 'build', '--build-arg', 'vcs_ref=b0c5ead01b6cabdb3f01871bce699be165c3288f', '--build-arg', 'build_date=2018-06-08T17:18:13Z', '--build-arg', 'foo=bar', '--build-arg', 'baz=test=with=equals', '--tag', 'test/test-image:latest', runner.directory)
       runner.build(build_args: ['foo=bar', 'baz=test=with=equals'])
     end
 
     it 'prioritizes version as a build arg over regular version' do
       expect(File).to receive(:read).with("#{runner.directory}/#{runner.dockerfile}").and_return(read_dockerfile_with_version)
-      expect(Docker::Image).to receive(:build_from_dir).with(runner.directory, { 't' => 'test/test-image:latest', 'dockerfile' => runner.dockerfile, 'buildargs' => buildargs_with_version }).and_return(image)
-      expect(Docker::Image).to receive(:build_from_dir).with(runner.directory, { 't' => 'test/test-image:1.2.3', 'dockerfile' => runner.dockerfile, 'buildargs' => buildargs_with_version }).and_return(image)
+      expect(Open3).to receive(:popen2e).with('docker', 'build', '--build-arg', 'vcs_ref=b0c5ead01b6cabdb3f01871bce699be165c3288f', '--build-arg', 'build_date=2018-06-08T17:18:13Z', '--build-arg', 'version=1.2.3', '--tag', 'test/test-image:latest', '--tag', 'test/test-image:1.2.3', runner.directory)
       runner.build(version: '1.2.4', build_args: ['version=1.2.3'])
     end
 
@@ -88,53 +83,31 @@ describe PuppetDockerTools::Runner do
       allow(File).to receive(:exist?).with('/tmp/test-image/Dockerfile.test').and_return(true)
       expect(File).to receive(:read).with('/tmp/test-image/Dockerfile.test').and_return(read_dockerfile)
       expect(PuppetDockerTools::Utilities).to receive(:get_value_from_env).with('version', namespace: 'org.label-schema', directory: '/tmp/test-image', dockerfile: 'Dockerfile.test').and_return(nil)
-      expect(Docker::Image).to receive(:build_from_dir).with('/tmp/test-image', { 't' => 'test/test-image:latest', 'dockerfile' => 'Dockerfile.test', 'buildargs' => buildargs }).and_return(image)
+      expect(Open3).to receive(:popen2e).with('docker', 'build', '--build-arg', 'vcs_ref=b0c5ead01b6cabdb3f01871bce699be165c3288f', '--build-arg', 'build_date=2018-06-08T17:18:13Z', '--no-cache', '--file', 'Dockerfile.test', '--tag', 'test/test-image:latest', runner.directory)
       local_runner = create_runner(directory: '/tmp/test-image', repository: 'test', namespace: 'org.label-schema', dockerfile: 'Dockerfile.test')
-      local_runner.build
+      local_runner.build(no_cache: true)
     end
   end
 
   describe '#lint' do
-    let(:passing_exit) {
-      {
-        'State' => {
-          'ExitCode' => 0
-        }
-      }
-    }
-    let(:failing_exit) {
-      {
-        'State' => {
-          'ExitCode' => 1
-        }
-      }
-    }
-
-    let(:container) { double(Docker::Container).as_null_object }
-
     before do
-      allow(PuppetDockerTools::Utilities).to receive(:pull).and_return(double(Docker::Image))
-      allow(Docker::Container).to receive(:create).and_return(container)
-      allow(container).to receive(:tap).and_return(container)
-      allow(container).to receive(:attach)
-      allow(container).to receive(:wait)
-      allow(container).to receive(:logs).and_return('container logs')
+      allow(PuppetDockerTools::Utilities).to receive(:pull)
     end
 
     it "should lint the container" do
-      allow(container).to receive(:json).and_return(passing_exit)
+      allow(Open3).to receive(:capture2e).and_return(['', 0])
       runner.lint
     end
 
     it "should exit with exit status if something went wrong" do
-      allow(container).to receive(:json).and_return(failing_exit)
+      allow(Open3).to receive(:capture2e).and_return(['container logs', 1])
       expect { runner.lint }.to raise_error(RuntimeError, /container logs/)
     end
   end
 
   describe '#local_lint' do
     it "should fail with logs if linting fails" do
-      allow(Open3).to receive(:capture2e).with(PuppetDockerTools::Utilities.get_hadolint_command('/tmp/test-image/Dockerfile')).and_return('container logs', 1)
+      allow(Open3).to receive(:capture2e).with(*PuppetDockerTools::Utilities.get_hadolint_command('/tmp/test-image/Dockerfile')).and_return('container logs', 1)
       expect { runner.local_lint }.to raise_error(RuntimeError, /container logs/)
     end
   end
@@ -223,8 +196,8 @@ HERE
     it "runs tests under the 'spec' directory" do
       tests=["/tmp/test-image/spec/test1_spec.rb", "/tmp/test-image/spec/test2_spec.rb"]
       expect(Dir).to receive(:glob).with("/tmp/test-image/spec/*_spec.rb").and_return(tests)
-      expect(Open3).to receive(:popen2e).with('rspec spec /tmp/test-image/spec/test1_spec.rb')
-      expect(Open3).to receive(:popen2e).with('rspec spec /tmp/test-image/spec/test2_spec.rb')
+      expect(Open3).to receive(:popen2e).with('rspec', 'spec', '/tmp/test-image/spec/test1_spec.rb')
+      expect(Open3).to receive(:popen2e).with('rspec', 'spec', '/tmp/test-image/spec/test2_spec.rb')
       runner.spec
     end
   end

data/spec/lib/puppet_docker_tools/utilities_spec.rb

@@ -81,15 +81,20 @@ HERE
     }
   }
 
-  let(:config_labels) { {
-    'Config' => {
-      'Labels' => {
-        'org.label-schema.vendor' => 'Puppet',
-        'org.label-schema.version' => '1.2.3',
-        'org.label-schema.vcs-ref' => 'b75674e1fbf52f7821f7900ab22a19f1a10cafdb'
-      }
-    }
-  }
+  let(:labels) {
+    '{
+      "org.label-schema.build-date":"2018-08-24T21:31:54Z",
+      "org.label-schema.dockerfile":"/Dockerfile",
+      "org.label-schema.license":"Apache-2.0",
+      "org.label-schema.maintainer":"Puppet Release Team <release@puppet.com>",
+      "org.label-schema.name":"Puppet Server",
+      "org.label-schema.schema-version":"1.0",
+      "org.label-schema.url":"https://github.com/puppetlabs/puppetserver",
+      "org.label-schema.vcs-ref":"5296a6a86b141c9c1aeab63258205ae664d4108d",
+      "org.label-schema.vcs-url":"https://github.com/puppetlabs/puppetserver",
+      "org.label-schema.vendor":"Puppet",
+      "org.label-schema.version":"5.3.5"
+    }'
   }
 
   describe "#filter_build_args" do
@@ -107,11 +112,8 @@ HERE
   end
 
   describe "#get_value_from_label" do
-    let(:image) { double(Docker::Image).as_null_object }
-
     before do
-      allow(Docker::Image).to receive(:get).and_return(image)
-      allow(image).to receive(:json).and_return(config_labels)
+      allow(Open3).to receive(:capture2).and_return(labels)
     end
 
     it "returns the value of a label" do
@@ -119,7 +121,7 @@ HERE
     end
 
     it "replaces '_' with '-' in the label name" do
-      expect(PuppetDockerTools::Utilities.get_value_from_label('puppet/puppetserver-test', value: 'vcs_ref', namespace: 'org.label-schema')).to eq('b75674e1fbf52f7821f7900ab22a19f1a10cafdb')
+      expect(PuppetDockerTools::Utilities.get_value_from_label('puppet/puppetserver-test', value: 'vcs_ref', namespace: 'org.label-schema')).to eq('5296a6a86b141c9c1aeab63258205ae664d4108d')
     end
 
     it "returns nil if you ask for a value that isn't there" do
@@ -213,58 +215,18 @@ HERE
 
   describe '#pull' do
     it 'will pull a single image if the image has a tag' do
-      expect(PuppetDockerTools::Utilities).to receive(:pull_single_tag).with('test/test-dir:latest')
+      expect(Open3).to receive(:popen2e).with('docker', 'pull', 'test/test-dir:latest')
       PuppetDockerTools::Utilities.pull('test/test-dir:latest')
     end
-
-    it 'will pull all the images if no tag is passed' do
-      expect(PuppetDockerTools::Utilities).to receive(:pull_all_tags).with('test/test-dir')
-      PuppetDockerTools::Utilities.pull('test/test-dir')
-    end
-  end
-
-  describe '#pull_all_tags' do
-    let(:image_info) {
-      {
-        'Created' => '2018-05-11T20:09:32Z',
-        'RepoTags' => ['latest', '1.2.3'],
-      }
-    }
-
-    let(:image) { double(Docker::Image) }
-    let(:images) { [image] }
-
-    it 'pulls the tags' do
-      expect(Docker::Image).to receive(:create).with('fromImage' => 'test/test-dir')
-      expect(Docker::Image).to receive(:all).and_return(images)
-      expect(image).to receive(:info).and_return(image_info).twice
-      PuppetDockerTools::Utilities.pull_all_tags('test/test-dir')
-    end
-  end
-
-  describe '#pull_single_tag' do
-    let(:image_info) {
-      {
-        'Created' => '2018-05-11T20:09:32Z',
-        'RepoTags' => ['1.2.3'],
-      }
-    }
-    let(:image) { double(Docker::Image) }
-
-    it 'pulls the single tag' do
-      expect(Docker::Image).to receive(:create).with('fromImage' => 'test/test-dir:1.2.3').and_return(image)
-      expect(image).to receive(:info).and_return(image_info).twice
-      PuppetDockerTools::Utilities.pull_single_tag('test/test-dir:1.2.3')
-    end
   end
 
   describe '#get_hadolint_command' do
     it 'generates a commmand with a dockerfile' do
-      expect(PuppetDockerTools::Utilities.get_hadolint_command('test/Dockerfile')).to eq('hadolint --ignore DL3008 --ignore DL3018 --ignore DL4000 --ignore DL4001 test/Dockerfile')
+      expect(PuppetDockerTools::Utilities.get_hadolint_command('test/Dockerfile')).to eq(['hadolint', '--ignore', 'DL3008', '--ignore', 'DL3018', '--ignore', 'DL4000', '--ignore', 'DL4001', 'test/Dockerfile'])
     end
 
     it 'defaults to generating a command that reads from stdin' do
-      expect(PuppetDockerTools::Utilities.get_hadolint_command).to eq('hadolint --ignore DL3008 --ignore DL3018 --ignore DL4000 --ignore DL4001 -')
+      expect(PuppetDockerTools::Utilities.get_hadolint_command).to eq(['hadolint', '--ignore', 'DL3008', '--ignore', 'DL3018', '--ignore', 'DL4000', '--ignore', 'DL4001', '-'])
     end
   end
 

data/spec/support/context/with_docker_container.rb

@@ -1,11 +1,44 @@
+require 'open3'
+
 shared_context 'with a docker container' do
+  def is_running?(container)
+    is_running = false
+    output, _ = Open3.capture2e('docker', 'inspect', '--format', "'{{ .Config.Healthcheck }}'", "#{container}")
+    output.chomp!
+    output.gsub!(/'/, '')
+
+    # no configured healthcheck
+    if output.chomp == "<nil>"
+      command = ['docker', 'inspect', '-f', "'{{.State.Status}}'", "#{container}"]
+    else
+      command = ['docker', 'inspect', '-f', "'{{.State.Health.Status}}'", "#{container}"]
+    end
+
+    while ! is_running
+      output, _ = Open3.capture2e(*command)
+      output.chomp!
+      output.gsub!(/'/, '')
+
+      case output
+      when 'healthy', 'running'
+        return true
+      when 'unhealthy', 'removing', 'paused', 'exited', 'dead'
+        return false
+      end
+
+      puts "Container is not running yet, will try again in 5 seconds..."
+      sleep(5)
+    end
+  end
+
   before(:all) do
-    @container = Docker::Container.create('Image' => @image.id)
-    @container.start
+    @container = %x(docker run --detach --rm -i #{@image}).chomp
+    unless is_running?(@container)
+      fail "something went wrong with container startup!"
+    end
   end
 
   after(:all) do
-    @container.kill
-    @container.delete(force: true)
+    %x(docker container kill #{@container})
   end
 end

data/spec/support/context/with_docker_image.rb

@@ -1,9 +1,19 @@
+require 'json'
 shared_context 'with a docker image' do
   before(:all) do
-    @image = Docker::Image.build_from_dir(CURRENT_DIRECTORY)
+    if ENV['PUPPET_TEST_DOCKER_IMAGE'] && !ENV['PUPPET_TEST_DOCKER_IMAGE'].empty?
+      @image=ENV['PUPPET_TEST_DOCKER_IMAGE']
+    else
+      @image = "test/#{File.basename(CURRENT_DIRECTORY)}:#{Random.rand(1000)}"
+      %x(docker image build --tag #{@image} #{CURRENT_DIRECTORY})
+    end
+    puts "Running tests on #{@image}..."
+    @image_json = JSON.parse(%x(docker inspect #{@image}))
+  end
 
-    set :os, family: @os || :debian
-    set :backend, :docker
-    set :docker_image, @image.id
+  after(:all) do
+    if !ENV['PUPPET_TEST_DOCKER_IMAGE'] || ENV['PUPPET_TEST_DOCKER_IMAGE'].empty?
+      %x(docker image rm --force #{@image})
+    end
   end
 end

data/spec/support/context/with_transient_docker_container.rb

@@ -0,0 +1,9 @@
+shared_context 'with a transient docker container' do
+  before(:each) do
+    @container = %x(docker run --detach --rm -i #{@image}).chomp
+  end
+
+  after(:each) do
+    %x(docker container kill #{@container})
+  end
+end

data/spec/support/examples/running_container.rb

@@ -1,11 +1,45 @@
-shared_examples "a running container" do |command, exit_status|
-  it "should run #{command} with exit status #{exit_status}" do
-    container = Docker::Container.create('Image' => @image.id, 'Cmd' => command)
-    container.start
-    container.wait
-    exit_status = container.json['State']['ExitCode']
-    expect(exit_status).to eq(exit_status)
-    container.kill
-    container.delete(force: true)
+require 'open3'
+
+shared_examples "a running container" do |command, exit_code, expected_output|
+  unless command.is_a? Array
+    command = command.split(' ')
+  end
+
+  if expected_output && exit_code
+    it "should run #{command} with output matching #{expected_output} and exit code #{exit_code}" do
+      output, status = Open3.capture2e('docker', 'exec', @container, *command)
+      expect(output).to match(/#{expected_output}/)
+      expect(status.exitstatus).to eq(exit_code)
+    end
+  elsif expected_output
+    it "should run #{command} with output matching #{expected_output}" do
+      output, _ = Open3.capture2e('docker', 'exec', @container, *command)
+      expect(output).to match(/#{expected_output}/)
+    end
+  elsif exit_code
+    it "should run #{command} with exit code #{exit_code}" do
+      _, status = Open3.capture2e('docker', 'exec', @container, *command)
+      expect(status.exitstatus).to eq(exit_code)
+    end
+  end
+
+end
+
+shared_examples "a service in a container" do |service, user, arg, pid|
+  if service && user
+    it "should run #{service} as #{user}" do
+      if pid
+        output, status = Open3.capture2e('docker', 'exec', @container, 'ps', '-f', '--quick-pid', pid)
+      else
+        output, status = Open3.capture2e('docker', 'exec', @container, 'ps', '-f', '-u', user)
+        output = output.split("\n").select { |proc| proc[/#{service}/] }.join('')
+      end
+      expect(status.exitstatus).to eq(0)
+      expect(output).to match(/#{service}/)
+      expect(output).to match(/#{user}/)
+      if arg
+        expect(output).to match(/#{arg}/)
+      end
+    end
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: puppet_docker_tools
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-05 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: docker-api
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.34'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.34'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: serverspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.41'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.41'
 - !ruby/object:Gem::Dependency
   name: docopt
   requirement: !ruby/object:Gem::Requirement
@@ -82,11 +54,9 @@ files:
 - lib/puppet_docker_tools/utilities.rb
 - spec/lib/puppet_docker_tools/runner_spec.rb
 - spec/lib/puppet_docker_tools/utilities_spec.rb
-- spec/support/context/using_alpine.rb
-- spec/support/context/using_centos.rb
 - spec/support/context/with_docker_container.rb
-- spec/support/context/with_docker_container_dummy_cmd.rb
 - spec/support/context/with_docker_image.rb
+- spec/support/context/with_transient_docker_container.rb
 - spec/support/examples/running_container.rb
 homepage: https://github.com/puppetlabs/puppet_docker_tools
 licenses:
@@ -108,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 3
 summary: Puppet tools for building docker images

data/spec/support/context/using_alpine.rb

@@ -1,5 +0,0 @@
-shared_context 'using alpine' do
-  before(:all) do
-    @os = :alpine
-  end
-end

data/spec/support/context/using_centos.rb

@@ -1,5 +0,0 @@
-shared_context 'using centos' do
-  before(:all) do
-    @os = :redhat
-  end
-end

data/spec/support/context/with_docker_container_dummy_cmd.rb

@@ -1,18 +0,0 @@
-shared_context 'with a docker container with a dummy cmd' do
-  before(:all) do
-    @image = Docker::Image.build_from_dir(CURRENT_DIRECTORY)
-    @container = Docker::Container.create(
-      'Image' => @image.id,
-      'Cmd' => ['sh', '-c', 'while true; do sleep 1; done']
-    )
-    @container.start
-
-    set :backend, :docker
-    set :docker_container, @container.id
-  end
-
-  after(:all) do
-    @container.kill
-    @container.delete(force: true)
-  end
-end