kitchen-docker_cli 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e0a0e76a7c98fcaba3b91e0477e5856ed858cf2
-  data.tar.gz: e78245d37535383507da953c3832b4b82b458481
+  metadata.gz: d09c1ca759499f465522eac8a5450d03c9a156f6
+  data.tar.gz: 3c02d60023b1f6cd810209756de6494a51961ea6
 SHA512:
-  metadata.gz: 67bb308266dbbdd7d7479b14d6e750d17a38f5d1c75caf5f00b85652a4d4195ed4c1465a525329da413491b49b7a780f57b1d0d4dcea8610b6188ff6b150fe5d
-  data.tar.gz: 613420358e245663d8d11b43cab6c67aaa085f1547e1a6040c45e310aea0c4055d548c612b9460eb92b5e8040bbe2b3d8811e5e617d8e7c718b9a02e7a09eedb
+  metadata.gz: a756a6c2d28cc7f572d38fcb9b561487f82be6cff4efbc440ad02a86ac8cf7d984eee63a1cb01b370f3b36e74c17cf2bb02eeecd70a8d2be05d3cdf488f4e775
+  data.tar.gz: 1273593f19790281578cf9522e79a1f4378038b8af3d861dc1d4294147f667ae422a22b285ed2d3ee53ed34db7eeba7a44ed7fccafe95cdab5dd02e099b2c31b

data/.kitchen.yml

@@ -25,3 +25,5 @@ suites:
       name: ansible_playbook
       playbook: test/integration/ansible/default.yml
       hosts: 127.0.0.1
+    verifier:
+      ruby_bindir: /usr/bin

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.13.0
+
+* Support Docker LXC driver(for CircleCI)
+
 ## 0.12.1
 
 * Fix error on `kitchen-ansible` with extra_vars [#18][]
@@ -90,4 +94,4 @@
 [#18]: https://github.com/marcy-terui/kitchen-docker_cli/issues/18
 [@grubernaut]: https://github.com/grubernaut
 [@hd-deman]: https://github.com/hd-deman
-[@yewton]: https://github.com/yewton
+[@yewton]: https://github.com/yewton

data/Gemfile

@@ -1,7 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-group :development do
-  gem 'kitchen-ansible'
-end

data/README.md

@@ -59,6 +59,8 @@ suites:
     attributes:
 ```
 
+## Driver Configuration
+
 ### image
 
 The Docker image's path.
@@ -317,6 +319,7 @@ For best results, please:
 ```
 
 ### dockerfile_vars
+
 Template variables for the custom Dockerfile.
 
 Example:
@@ -371,6 +374,56 @@ This option with value 0 indicates that the running container has access to all
   cpu_shares: 512
 ```
 
+## Transport Configuration
+
+### lxc_driver
+
+If you use the LXC Driver of Docker (CircleCI), please set `true`  
+
+The default value is `false`
+
+```yml
+  lxc_driver: true
+```
+
+### docker_base
+
+Base of `docker` command.
+
+The default value is `docker`
+
+Example:
+
+```yml
+  docker_base: sudo /path/to/docker
+```
+
+### lxc_attach_base
+
+Base of `lxc-attach` command.  
+This option is used on LXC driver only.
+
+The default value is `sudo lxc-attach`
+
+Example:
+
+```yml
+  docker_base: sudo /path/to/lxc-attach
+```
+
+### lxc_console_base
+
+Base of `lxc-console` command.  
+This option is used on LXC driver only.
+
+The default value is `sudo lxc-console`
+
+Example:
+
+```yml
+  docker_base: sudo /path/to/lxc-console
+```
+
 ## <a name="development"></a> Development
 
 * Source hosted at [GitHub][repo]

data/circle.yml

@@ -0,0 +1,15 @@
+---
+machine:
+  ruby:
+    version: 2.1.5
+  services:
+    - docker
+
+dependencies:
+  override:
+    - bundle install --path=vendor/bundle:
+        pwd: integration-test
+test:
+  override:
+    - bundle exec kitchen test:
+        pwd: integration-test

data/integration-test/.kitchen.yml

@@ -4,19 +4,26 @@ driver:
 
 transport:
   name: docker_cli
+  lxc_driver: true
 
 driver_config:
   hostname: example.local
 
-provisioner:
-  name: chef_zero
-
 platforms:
   - name: ubuntu-12.04
   - name: centos-6.4
 
 suites:
-  - name: default
+  - name: chef
+    provisioner:
+      name: chef_zero
     run_list:
       - recipe[integration-test::default]
     attributes:
+
+  - name: ansible
+    provisioner:
+      name: ansible_playbook
+      require_ruby_for_busser: false
+      playbook: test/integration/ansible/default.yml
+      hosts: 127.0.0.1

data/integration-test/Gemfile

@@ -1,3 +1,4 @@
 source "https://rubygems.org"
 
 gem 'kitchen-docker_cli', path: '../'
+gem 'kitchen-ansible'

data/kitchen-docker_cli.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = []
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features|integration-test)/})
   spec.require_paths = ['lib']
 
   spec.add_dependency 'test-kitchen', '>= 1.3'

data/lib/kitchen/driver/docker_cli.rb

@@ -139,6 +139,7 @@ module Kitchen
           when 'rhel', 'centos', 'fedora'
             file << 'RUN yum clean all'
             file << 'RUN yum -y install sudo curl tar'
+            file << 'RUN echo "Defaults:root !requiretty" >> /etc/sudoers'
           else
             # TODO: Support other distribution
           end

data/lib/kitchen/driver/docker_cli_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for DockerCli Kitchen driver
-    DOCKER_CLI_VERSION = '0.12.1'
+    DOCKER_CLI_VERSION = '0.13.0'
   end
 end

data/lib/kitchen/transport/docker_cli.rb

@@ -29,6 +29,10 @@ module Kitchen
       plugin_version Kitchen::VERSION
 
       default_config :host, nil
+      default_config :lxc_driver, false
+      default_config :docker_base, "docker"
+      default_config :lxc_attach_base, "sudo lxc-attach"
+      default_config :lxc_console_base, "sudo lxc-console"
 
       def connection(state, &block)
         options = config.to_hash.merge(state)
@@ -40,24 +44,46 @@ module Kitchen
         include ShellOut
 
         def login_command
+          if @options[:lxc_driver]
+            lxc_login_command
+          else
+            docker_login_command
+          end
+        end
+
+        def docker_login_command
           args = []
           args << 'exec'
           args << '-t'
           args << '-i'
           args << @options[:container_id]
           args << '/bin/bash'
-          LoginCommand.new(binary, args)
+          LoginCommand.new(docker_base, args)
         end
 
-        def execute(command)
-          if command
-            exec_cmd = docker_exec_command(@options[:container_id], command, :tty => true)
-            run_docker(exec_cmd)
+        def lxc_login_command
+          args = []
+          args << 'in'
+          args << "\"$(#{docker_base} inspect --format '{{.Id}}' #{@options[:container_id]})\""
+          LoginCommand.new(@options[:lxc_console_base], args)
+        end
+
+        def execute(cmd)
+          if cmd
+            if @options[:lxc_driver]
+              run_lxc(lxc_exec_command(@options[:container_id], cmd))
+            else
+              run_docker(docker_exec_command(@options[:container_id], cmd, :tty => true))
+            end
           end
         end
 
-        def run_docker(command, options={})
-          run_command("#{binary} #{command}", options)
+        def run_lxc(cmd, options={})
+          run_command("#{lxc_attach_base} #{cmd}", options)
+        end
+
+        def run_docker(cmd, options={})
+          run_command("#{docker_base} #{cmd}", options)
         end
 
         def upload(locals, remote)
@@ -65,7 +91,11 @@ module Kitchen
           execute(cmd)
           Array(locals).each do |local|
             remote_cmd = "tar x -C #{remote}"
-            remote_cmd = "#{binary} #{docker_exec_command(@options[:container_id], remote_cmd, :interactive => true)}"
+            if @options[:lxc_driver]
+              remote_cmd = "#{lxc_attach_base} #{lxc_exec_command(@options[:container_id], remote_cmd)}"
+            else
+              remote_cmd = "#{docker_base} #{docker_exec_command(@options[:container_id], remote_cmd, :interactive => true)}"
+            end
             local_cmd  = "cd #{File.dirname(local)} && tar cf - ./#{File.basename(local)}"
             run_command("#{local_cmd} | #{remote_cmd}")
           end
@@ -75,12 +105,24 @@ module Kitchen
           exec_cmd = "exec"
           exec_cmd << " -t" if opt[:tty]
           exec_cmd << " -i" if opt[:interactive]
-          cmd = Util.wrap_command(cmd.gsub("'", "'\\\\''")) unless cmd.match(/\Ash\s\-c/)
-          exec_cmd << " #{container_id} #{cmd}"
+          exec_cmd << " #{container_id} #{wrap_command(cmd)}"
+        end
+
+        def lxc_exec_command(container_id, cmd)
+          exec_cmd = " -n \"$(#{docker_base} inspect --format '{{.Id}}' #{@options[:container_id]})\""
+          exec_cmd << " -- #{wrap_command(cmd)}"
+        end
+
+        def wrap_command(cmd)
+          cmd.match(/\Ash\s\-c/) ? cmd : Util.wrap_command(cmd.gsub('\'', "'\\\\''"))
+        end
+
+        def docker_base
+          @options[:docker_base]
         end
 
-        def binary
-          "docker"
+        def lxc_attach_base
+          @options[:lxc_attach_base]
         end
 
       end

data/spec/kitchen/driver/docker_cli_spec.rb

@@ -198,7 +198,8 @@ describe Kitchen::Driver::DockerCli, "docker_file" do
     example do
       ret = "FROM centos/centos6\n"
       ret << "RUN yum clean all\n"
-      ret << "RUN yum -y install sudo curl tar"
+      ret << "RUN yum -y install sudo curl tar\n"
+      ret << 'RUN echo "Defaults:root !requiretty" >> /etc/sudoers'
       expect(@docker_cli.send(:docker_file)).to eq ret
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker_cli
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Masashi Terui
@@ -110,6 +110,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- circle.yml
 - integration-test/.gitignore
 - integration-test/.kitchen.yml
 - integration-test/Gemfile
@@ -117,8 +118,9 @@ files:
 - integration-test/chefignore
 - integration-test/metadata.rb
 - integration-test/recipes/default.rb
-- integration-test/test/integration/default/serverspec/default_spec.rb
-- integration-test/test/integration/default/serverspec/spec_helper.rb
+- integration-test/test/integration/ansible/default.yml
+- integration-test/test/integration/chef/serverspec/default_spec.rb
+- integration-test/test/integration/chef/serverspec/spec_helper.rb
 - kitchen-docker_cli.gemspec
 - lib/kitchen/docker_cli/dockerfile_template.rb
 - lib/kitchen/driver/docker_cli.rb
@@ -128,9 +130,6 @@ files:
 - spec/kitchen/driver/dockerfile.erb
 - spec/kitchen/driver/dockerfile_nil.erb
 - spec/spec_helper.rb
-- test/integration/ansible/default.yml
-- test/integration/chef/serverspec/dns_spec.rb
-- test/integration/chef/serverspec/spec_helper.rb
 homepage: https://github.com/marcy-terui/kitchen-docker_cli
 licenses:
 - Apache 2.0
@@ -156,10 +155,17 @@ signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver for Docker native CLI
 test_files:
+- integration-test/.gitignore
+- integration-test/.kitchen.yml
+- integration-test/Gemfile
+- integration-test/README.md
+- integration-test/chefignore
+- integration-test/metadata.rb
+- integration-test/recipes/default.rb
+- integration-test/test/integration/ansible/default.yml
+- integration-test/test/integration/chef/serverspec/default_spec.rb
+- integration-test/test/integration/chef/serverspec/spec_helper.rb
 - spec/kitchen/driver/docker_cli_spec.rb
 - spec/kitchen/driver/dockerfile.erb
 - spec/kitchen/driver/dockerfile_nil.erb
 - spec/spec_helper.rb
-- test/integration/ansible/default.yml
-- test/integration/chef/serverspec/dns_spec.rb
-- test/integration/chef/serverspec/spec_helper.rb

data/test/integration/chef/serverspec/dns_spec.rb

@@ -1,7 +0,0 @@
-require 'spec_helper'
-
-describe file('/etc/resolv.conf') do
-  ['8.8.8.8', '199.85.126.10'].each do |h|
-    its(:content) { should contain h }
-  end
-end

data/test/integration/chef/serverspec/spec_helper.rb

@@ -1,3 +0,0 @@
-require 'serverspec'
-
-set :backend, :exec