kitchen-docker 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ac895bb5b0be3d5089efcadf3f6c6067d5603ce
-  data.tar.gz: 28f3c2dc7fcf14f09209cd81d2973dfee973299e
+  metadata.gz: 49be9eaec81f6c9277c620d4c99e7a50b99f930f
+  data.tar.gz: 1daa96d8e99245bec677921425fe125a21266544
 SHA512:
-  metadata.gz: 5a33adf818806a487c6d2cf5584bfb09b3cffac4f178ddcdab6336e0cce961ee3375167127b6bef88015d516eec7894da4b62bb00ba07c654a0ac4bcb711b7b9
-  data.tar.gz: 16a68010bcb5ec673ef1e7f9f0f6a179514fb53777287da82871e24de6c2784b0bccd3dddc7d89341dae2c94e97ac5b2783679d2ec14881080515ec7bcb80a89
+  metadata.gz: ed5cc8b3f3cd1d8300969bb4fe51c7dcd288dcc79a9744dcdd37150cd73231111ca3dec9ce1ff3f9797e40cbd55a809e97c38da69613ef47abfd872c95b722f6
+  data.tar.gz: a21bf725b1eb0082d32a8e6dd4e955f0847b667a8e015a08ba1a04a2c2e5abe1ebbe6241810ed3cffe7d9e8ee13e6b05032c9d04f0d4b8c1daf095a112ead259

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 2.4.0
+
+* [#148](https://github.com/portertech/kitchen-docker/issues/148) Restored support for older versions of Ruby.
+* [#149](https://github.com/portertech/kitchen-docker/pulls/149) Handle connecting to a container directly as root.
+* [#154](https://github.com/portertech/kitchen-docker/pulls/154) Improve container caching by reordering the build steps.
+* [#176](https://github.com/portertech/kitchen-docker/pulls/176) Expose proxy environment variables to the container automatically.
+* [#192](https://github.com/portertech/kitchen-docker/pulls/192) Set `$container=docker` for CentOS images.
+* [#196](https://github.com/portertech/kitchen-docker/pulls/196) Mutex SSH key generation for use with `kitchen -c`.
+* [#192](https://github.com/portertech/kitchen-docker/pulls/192) Don't wait when stopping a container.
+
 ## 2.3.0
 
 * `build_context` option (boolean) to enable/disable sending the build

data/README.md

@@ -94,7 +94,11 @@ Examples:
   socket: tcp://docker.example.com:4242
 ```
 
-If you use [Boot2Docker](https://github.com/boot2docker/boot2docker), set your `DOCKER_HOST` environment variable properly (e.g. `export DOCKER_HOST=tcp://192.168.59.103:2375`) or you have to use the following:
+If you use [Boot2Docker](https://github.com/boot2docker/boot2docker)
+or [docker-machine](https://docs.docker.com/machine/get-started/) set
+your `DOCKER_HOST` environment variable properly with `export
+DOCKER_HOST=tcp://192.168.59.103:2375` or `eval "$(docker-machine env
+$MACHINE)"` then use the following:
 
 ```yaml
 socket: tcp://192.168.59.103:2375

data/lib/kitchen/driver/docker.rb

@@ -70,6 +70,8 @@ module Kitchen
         !driver.remote_socket?
       end
 
+      MUTEX_FOR_SSH_KEYS = Mutex.new
+
       def verify_dependencies
         run_command("#{config[:binary]} >> #{dev_null} 2>&1", :quiet => true)
         rescue
@@ -137,23 +139,42 @@ module Kitchen
       end
 
       def generate_keys
-        if !File.exist?(config[:public_key]) || !File.exist?(config[:private_key])
-          private_key = OpenSSL::PKey::RSA.new(2048)
-          blobbed_key = Base64.encode64(private_key.to_blob).gsub("\n", '')
-          public_key = "ssh-rsa #{blobbed_key} kitchen_docker_key"
-          File.open(config[:private_key], 'w') do |file|
-            file.write(private_key)
-            file.chmod(0600)
-          end
-          File.open(config[:public_key], 'w') do |file|
-            file.write(public_key)
-            file.chmod(0600)
+        MUTEX_FOR_SSH_KEYS.synchronize do
+          if !File.exist?(config[:public_key]) || !File.exist?(config[:private_key])
+            private_key = OpenSSL::PKey::RSA.new(2048)
+            blobbed_key = Base64.encode64(private_key.to_blob).gsub("\n", '')
+            public_key = "ssh-rsa #{blobbed_key} kitchen_docker_key"
+            File.open(config[:private_key], 'w') do |file|
+              file.write(private_key)
+              file.chmod(0600)
+            end
+            File.open(config[:public_key], 'w') do |file|
+              file.write(public_key)
+              file.chmod(0600)
+            end
           end
         end
       end
 
       def build_dockerfile
         from = "FROM #{config[:image]}"
+
+        env_variables = ''
+        if config[:http_proxy]
+          env_variables << "ENV http_proxy #{config[:http_proxy]}\n"
+          env_variables << "ENV HTTP_PROXY #{config[:http_proxy]}\n"
+        end
+
+        if config[:https_proxy]
+          env_variables << "ENV https_proxy #{config[:https_proxy]}\n"
+          env_variables << "ENV HTTPS_PROXY #{config[:https_proxy]}\n"
+        end
+
+        if config[:no_proxy]
+          env_variables << "ENV no_proxy #{config[:no_proxy]}\n"
+          env_variables << "ENV NO_PROXY #{config[:no_proxy]}\n"
+        end
+
         platform = case config[:platform]
         when 'debian', 'ubuntu'
           disable_upstart = <<-eos
@@ -168,6 +189,7 @@ module Kitchen
           config[:disable_upstart] ? disable_upstart + packages : packages
         when 'rhel', 'centos', 'fedora'
           <<-eos
+            ENV container docker
             RUN yum clean all
             RUN yum install -y sudo openssh-server openssh-clients which curl
             RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
@@ -201,27 +223,32 @@ module Kitchen
 
         username = config[:username]
         password = config[:password]
-        public_key = IO.read(config[:public_key])
+        public_key = IO.read(config[:public_key]).strip
+        homedir = username == 'root' ? '/root' : "/home/#{username}"
 
         base = <<-eos
-          RUN if ! getent passwd #{username}; then useradd -d /home/#{username} -m -s /bin/bash #{username}; fi
+          RUN if ! getent passwd #{username}; then \
+                useradd -d #{homedir} -m -s /bin/bash #{username}; \
+              fi
           RUN echo #{username}:#{password} | chpasswd
           RUN echo '#{username} ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
           RUN mkdir -p /etc/sudoers.d
           RUN echo '#{username} ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/#{username}
           RUN chmod 0440 /etc/sudoers.d/#{username}
-          RUN [ ! -d /home/#{username}/.ssh ] && mkdir /home/#{username}/.ssh
-          RUN chown -R #{username} /home/#{username}/.ssh
-          RUN chmod 0700 /home/#{username}/.ssh
-          RUN echo '#{public_key}' >> /home/#{username}/.ssh/authorized_keys
-          RUN chown #{username} /home/#{username}/.ssh/authorized_keys
-          RUN chmod 0600 /home/#{username}/.ssh/authorized_keys
+          RUN mkdir -p #{homedir}/.ssh
+          RUN chown -R #{username} #{homedir}/.ssh
+          RUN chmod 0700 #{homedir}/.ssh
+          RUN touch #{homedir}/.ssh/authorized_keys
+          RUN chown #{username} #{homedir}/.ssh/authorized_keys
+          RUN chmod 0600 #{homedir}/.ssh/authorized_keys
         eos
         custom = ''
         Array(config[:provision_command]).each do |cmd|
           custom << "RUN #{cmd}\n"
         end
-        [from, platform, base, custom].join("\n")
+        ssh_key = "RUN echo '#{public_key}' >> #{homedir}/.ssh/authorized_keys"
+        # Empty string to ensure the file ends with a newline.
+        [from, env_variables, platform, base, custom, ssh_key, ''].join("\n")
       end
 
       def dockerfile
@@ -249,10 +276,14 @@ module Kitchen
         cmd << " --no-cache" unless config[:use_cache]
         dockerfile_contents = dockerfile
         build_context = config[:build_context] ? '.' : '-'
-        output = Tempfile.create('Dockerfile-kitchen-', Dir.pwd) do |file|
-          file.write(dockerfile_contents)
+        file = Tempfile.new('Dockerfile-kitchen', Dir.pwd)
+        output = begin
+          file.write(dockerfile)
           file.close
           docker_command("#{cmd} -f #{file.path} #{build_context}", :input => dockerfile_contents)
+        ensure
+          file.close unless file.closed?
+          file.unlink
         end
         parse_image_id(output)
       end
@@ -322,7 +353,7 @@ module Kitchen
 
       def rm_container(state)
         container_id = state[:container_id]
-        docker_command("stop #{container_id}")
+        docker_command("stop -t 0 #{container_id}")
         docker_command("rm #{container_id}")
       end
 

data/lib/kitchen/driver/docker_version.rb

@@ -19,6 +19,6 @@ module Kitchen
   module Driver
 
     # Version string for Docker Kitchen driver
-    DOCKER_VERSION = "2.3.0"
+    DOCKER_VERSION = "2.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: A Docker Driver for Test Kitchen