kitchen-docker 0.1.0.dev → 0.1.1.dev

data/lib/kitchen/driver/docker.rb

@@ -29,6 +29,7 @@ module Kitchen
     class Docker < Kitchen::Driver::SSHBase
 
       default_config :image,                'ubuntu'
+      default_config :platform,             'ubuntu'
       default_config :port,                 '22'
       default_config :username,             'kitchen'
       default_config :password,             'kitchen'
@@ -50,19 +51,45 @@ module Kitchen
       protected
 
       def dockerfile
-        path = File.join(File.dirname(__FILE__), 'docker', 'Dockerfile')
-        File.expand_path(path)
+        from = "FROM #{config[:image]}"
+        platform = case config[:platform]
+        when 'debian', 'ubuntu'
+          <<-eos
+            ENV DEBIAN_FRONTEND noninteractive
+            RUN apt-get update
+            RUN apt-get install -y sudo openssh-server
+          eos
+        when 'rhel', 'centos'
+          <<-eos
+            RUN yum clean all
+            RUN yum install -y sudo openssh-server openssh-clients
+            RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
+            RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
+          eos
+        else
+          raise ActionFailed,
+          "Unknown platform '#{config[:platform]}'"
+        end
+        base = <<-eos
+          RUN mkdir /var/run/sshd
+          RUN echo '127.0.0.1 localhost.localdomain localhost' >> /etc/hosts
+          RUN useradd -d /home/kitchen -m -s /bin/bash kitchen
+          RUN echo kitchen:kitchen | chpasswd
+          RUN echo 'kitchen ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+        eos
+        [from, platform, base].join("\n")
       end
 
       def parse_image_id(output)
         output.each_line do |line|
           return line.split(/\s+/).last if line =~ /image id/i
         end
-        raise ActionFailed, 'Could not parse Docker build output for image ID'
+        raise ActionFailed,
+        'Could not parse Docker build output for image ID'
       end
 
       def build_image(state)
-        output = run_command("cat #{dockerfile} | docker build -")
+        output = run_command("docker build -", :input => dockerfile)
         parse_image_id(output)
       end
 
@@ -77,7 +104,8 @@ module Kitchen
 
       def run_container(state)
         image_id = state[:image_id]
-        output = run_command("docker run -d #{image_id} /usr/sbin/sshd -D -u0")
+        cmd = "docker run -d #{image_id} /usr/sbin/sshd -D -o UseDNS=no -o UsePAM=no"
+        output = run_command(cmd)
         parse_container_id(output)
       end
 

data/lib/kitchen/driver/docker_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Docker Kitchen driver
-    DOCKER_VERSION = "0.1.0.dev"
+    DOCKER_VERSION = "0.1.1.dev"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 0.1.0.dev
+  version: 0.1.1.dev
   prerelease: 6
 platform: ruby
 authors:
@@ -125,7 +125,6 @@ files:
 - Rakefile
 - kitchen-docker.gemspec
 - lib/kitchen/driver/docker.rb
-- lib/kitchen/driver/docker/Dockerfile
 - lib/kitchen/driver/docker_version.rb
 homepage: https://github.com/portertech/kitchen-docker
 licenses:
@@ -138,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: 1116186526893056534
+      hash: 3422827801630028328
       version: '0'
       segments:
       - 0

data/lib/kitchen/driver/docker/Dockerfile

@@ -1,17 +0,0 @@
-FROM ubuntu
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update
-
-RUN apt-get install -y sudo openssh-server
-
-RUN mkdir /var/run/sshd
-
-RUN useradd -d /home/kitchen -m -s /bin/bash kitchen
-
-RUN echo kitchen:kitchen | chpasswd
-
-RUN echo 'kitchen ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-RUN echo '127.0.0.1 localhost.localdomain localhost' >> /etc/hosts