kitchen-docker_cli 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 542121f429ecd37ef1d476965ab303b0328d29ab
-  data.tar.gz: b01101c45a35091e275e93bde71c04dd101984f1
+  metadata.gz: c7483d1dbadf7606fd954e80bf8b819bcf44b663
+  data.tar.gz: 0369d2399ac693f3526cfad5cd92c93542b8b93e
 SHA512:
-  metadata.gz: a124b04c5e9474e78c744948542653e867fbb9f49622e666d8fa47cf3636408f6e5334dc58d058b9050b0cc66e71b2bee0f839071f6f456e73238f1679f17c9c
-  data.tar.gz: 1ae8f6d48a4c270e1a1ebc25ee674266b15496a724e179ad9472b34a5552854dc8d5be66721a9ed7dd210ba7e26f1c6d849d0f81e14cd12169d5277266c85b5e
+  metadata.gz: 1bdc553437c67875343bea2405825be1394fc7687f11e1219575c44864ae849afb0524be1d9675ff1ef4daf6b82484823a64d5a58f93020b5de75d332890dfaa
+  data.tar.gz: 93444fbd34ea23487d1e2245e706a953db86906258ffe2c9e15700aa6fe423e8dd379397b060d286c2982fee70410550ac50e2e092ebfb82baaa7712ab3001c7

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.6.0
+
+* Pull request [#4][]: allow setup environment variables(add environment option) ([@hd-deman][])
+* Add `network` option
+
 ## 0.5.0
 
 * Add `memory_limit` option
@@ -17,11 +22,11 @@
 
 ## 0.2.0.beta
 
-* Add ```privileged``` option
+* Add `privileged` option
 
 ## 0.1.1.alpha
 
-* Change ```no_cache``` option's default value to ```false```
+* Change `no_cache` option's default value to `false`
 
 ## 0.1.0.alpha
 
@@ -29,4 +34,6 @@
 
 <!--- The following link definition list is generated by PimpMyChangelog --->
 [#2]: https://github.com/marcy-terui/kitchen-docker_cli/issues/2
+[#4]: https://github.com/marcy-terui/kitchen-docker_cli/issues/4
 [@grubernaut]: https://github.com/grubernaut
+[@hd-deman]: https://github.com/hd-deman

data/README.md

@@ -9,7 +9,7 @@ Therefore, we can test with an environment that has no extra software such as ``
 - Test-Kitchen (>= 1.3)
 
 - Docker (>= 1.3)
-This driver uses ```docker exec``` command.
+This driver uses `docker exec` command.
 
 - tar (GNU Tar)
 
@@ -19,7 +19,7 @@ This driver uses ```docker exec``` command.
 gem install kitchen-docker_cli
 ```
 
-or put ```Gemfile``` in your project directory.
+or put `Gemfile` in your project directory.
 
 ```ruby
 source 'https://rubygems.org'
@@ -35,7 +35,7 @@ bundle install
 
 ## <a name="config"></a> Configuration
 
-At first, put your ```.kithcen(.local).yml``` like this.
+At first, put your `.kithcen(.local).yml` like this.
 
 ```yml
 ---
@@ -56,7 +56,7 @@ suites:
 
 The Docker image's path.
 
-The default value get from ```platform.name```.
+The default value get from `platform.name`.
 
 Examples:
 
@@ -68,7 +68,7 @@ Examples:
 
 The Docker image's platform.
 
-The default value get from ```platform.name```.
+The default value get from `platform.name`.
 
 Examples:
 
@@ -78,9 +78,9 @@ Examples:
 
 ### command
 
-The command to be executed at ```docker run```.
+The command to be executed at `docker run`.
 
-The default value is ```sh -c 'while true; do sleep 1d; done;'```.
+The default value is `sh -c 'while true; do sleep 1d; done;'`.
 
 Examples:
 
@@ -90,9 +90,9 @@ Examples:
 
 ### run_command
 
-Adds ```RUN``` command(s) to ```Dockerfile```.
+Adds `RUN` command(s) to `Dockerfile`.
 
-The default value is ```nil```.
+The default value is `nil`.
 
 Examples:
 
@@ -102,11 +102,25 @@ Examples:
     - service httpd start
 ```
 
+### environment
+
+Adds `ENV` command(s) to `Dockerfile`.
+
+The default value is `nil`.
+
+Examples:
+
+```yml
+environment:
+  http_proxy: http://proxy.example.com:8080/
+  LANG: ja_JP.UTF-8
+```
+
 ### no_cache
 
-Not use the cached image on ```docker build```.
+Not use the cached image on `docker build`.
 
-The default value is ```false```.
+The default value is `false`.
 
 Examples:
 
@@ -118,7 +132,7 @@ Examples:
 
 Give extended privileges to the suite container.
 
-The default value is ```false```.
+The default value is `false`.
 
 Examples:
 
@@ -136,9 +150,23 @@ Examples:
   container_name: web
 ```
 
+### network
+
+Set the Network mode for the container.  
+- `bridge`: creates a new network stack for the container on the docker bridge
+- `none`: no networking for this container
+- `container:<name|id>`: reuses another container network stack
+- `host`: use the host network stack inside the container
+
+Examples:
+
+```yml
+  network: host
+```
+
 ### link
 
-Set ```container_name```(and alias) of other container(s) that connect from the suite container.
+Set `container_name`(and alias) of other container(s) that connect from the suite container.
 
 Examples:
 
@@ -152,6 +180,24 @@ Examples:
     - redis:kvs
 ```
 
+### publish
+
+Publish a container's port or a range of ports to the host.
+
+The default value is `nil`.
+
+Examples:
+
+```yml
+  publish: 80
+```
+
+```yml
+  publish:
+    - 80:8080
+    - 22:2222
+```
+
 ### publish_all
 
 Publish all exposed ports to the host interfaces.

data/lib/kitchen/driver/docker_cli.rb

@@ -131,6 +131,7 @@ module Kitchen
         cmd << " -m #{config[:memory_limit]}" if config[:memory_limit]
         cmd << " -c #{config[:cpu_shares]}" if config[:cpu_shares]
         cmd << ' --privileged' if config[:privileged]
+        cmd << " --net #{config[:network]}" if config[:network]
         Array(config[:publish]).each { |pub| cmd << " -p #{pub}" }
         Array(config[:volume]).each { |vol| cmd << " -v #{vol}" }
         Array(config[:link]).each { |link| cmd << " --link #{link}" }
@@ -187,6 +188,7 @@ module Kitchen
             # TODO: Support other distribution
           end
           Array(config[:run_command]).each { |cmd| file << "RUN #{cmd}" }
+          Array(config[:environment]).each { |env, value| file << "ENV #{env}=#{value}" }
           file.join("\n")
         end
       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.5.0'
+    DOCKER_CLI_VERSION = '0.6.0'
   end
 end

data/spec/kitchen/driver/docker_cli_spec.rb

@@ -240,12 +240,13 @@ describe Kitchen::Driver::DockerCli, "docker_run_command" do
         :volume => '/dev:/dev',
         :link => 'mysql:db',
         :memory_limit => '256m',
-        :cpu_shares => 512
+        :cpu_shares => 512,
+        :network => 'none'
       }
     end
 
     example do
-      cmd = "run -d --name web -P -m 256m -c 512 --privileged -p 80:8080 -p 22:2222 -v /dev:/dev --link mysql:db test /bin/bash"
+      cmd = "run -d --name web -P -m 256m -c 512 --privileged --net none -p 80:8080 -p 22:2222 -v /dev:/dev --link mysql:db test /bin/bash"
       expect(@docker_cli.docker_run_command('test')).to eq cmd
     end
   end
@@ -322,7 +323,8 @@ describe Kitchen::Driver::DockerCli, "docker_file" do
       {
         image: "ubuntu/12.04",
         platform: "ubuntu",
-        run_command: ["test", "test2"]
+        run_command: ["test", "test2"],
+        environment: {"test" => "hoge"}
       }
     }
     example do
@@ -330,7 +332,9 @@ describe Kitchen::Driver::DockerCli, "docker_file" do
       ret = "FROM ubuntu/12.04\n"
       ret << "RUN apt-get update\n"
       ret << "RUN apt-get -y install sudo curl tar\n"
-      ret << "RUN test\nRUN test2"
+      ret << "RUN test\n"
+      ret << "RUN test2\n"
+      ret << "ENV test=hoge"
       expect(@docker_cli.send(:docker_file)).to eq ret
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker_cli
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Masashi Terui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen