kitchen-docker_cli 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b0d097399f490533674ea2fa855615f81995df6
-  data.tar.gz: 60cea728ef7e62c624913c930aabed2445a53d9f
+  metadata.gz: 542121f429ecd37ef1d476965ab303b0328d29ab
+  data.tar.gz: b01101c45a35091e275e93bde71c04dd101984f1
 SHA512:
-  metadata.gz: 7dd67ba5691edebefd8c1d1c47c4fb52bec706fc280e089f065a756bef39fd152ce2348b699fb8c5efb0b5d8b5511fcf8348388780292b97b9e00d039fc94d32
-  data.tar.gz: 8a76f858b39728ad3584695a331943e56f689c56a055429063289ec5b6c4e7944edb2063e2754af0457c7c4ce4a39e2098ada126c0dfb5277787df1a841f13ed
+  metadata.gz: a124b04c5e9474e78c744948542653e867fbb9f49622e666d8fa47cf3636408f6e5334dc58d058b9050b0cc66e71b2bee0f839071f6f456e73238f1679f17c9c
+  data.tar.gz: 1ae8f6d48a4c270e1a1ebc25ee674266b15496a724e179ad9472b34a5552854dc8d5be66721a9ed7dd210ba7e26f1c6d849d0f81e14cd12169d5277266c85b5e

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.5.0
+
+* Add `memory_limit` option
+* Add `cpu_shares` option
+
 ## 0.4.0
 
 * Pull request [#2][]: Add custom `Dockerfile` support ([@grubernaut][])

data/README.md

@@ -183,16 +183,33 @@ Examples:
 
 ### dockerfile
 
-Create test image using a supplied dockerfile, instead of the default dockerfile created.
-For best results, please:
+Create test image using a supplied dockerfile, instead of the default dockerfile created.  
+For best results, please:  
   - Ensure Package Repositories are updated
-  - Ensure Dockerfile installs sudo, curl and tar
+  - Ensure Dockerfile installs sudo, curl, and tar
   - If Ubuntu/Debian, Set DEBIAN_FRONTEND to noninteractive
 
 ```yml
   dockerfile: my/dockerfile
 ```
 
+### memory_limit
+
+Constrain the memory available.
+
+```yml
+  memory_limit: 256m
+```
+
+### cpu_shares
+
+Change the priority of CPU Time.  
+This option with value 0 indicates that the running container has access to all 1024 (default) CPU shares.
+
+```yml
+  cpu_shares: 512
+```
+
 ## <a name="development"></a> Development
 
 * Source hosted at [GitHub][repo]

data/lib/kitchen/driver/docker_cli.rb

@@ -128,6 +128,8 @@ module Kitchen
         cmd = "run -d"
         cmd << " --name #{config[:container_name]}" if config[:container_name]
         cmd << ' -P' if config[:publish_all]
+        cmd << " -m #{config[:memory_limit]}" if config[:memory_limit]
+        cmd << " -c #{config[:cpu_shares]}" if config[:cpu_shares]
         cmd << ' --privileged' if config[:privileged]
         Array(config[:publish]).each { |pub| cmd << " -p #{pub}" }
         Array(config[:volume]).each { |vol| cmd << " -v #{vol}" }

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.4.0'
+    DOCKER_CLI_VERSION = '0.5.0'
   end
 end

data/spec/kitchen/driver/docker_cli_spec.rb

@@ -238,12 +238,14 @@ describe Kitchen::Driver::DockerCli, "docker_run_command" do
         :privileged => true,
         :publish => ['80:8080', '22:2222'],
         :volume => '/dev:/dev',
-        :link => 'mysql:db'
+        :link => 'mysql:db',
+        :memory_limit => '256m',
+        :cpu_shares => 512
       }
     end
 
     example do
-      cmd = "run -d --name web -P --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 -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

metadata

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