RubyGems - bigrig - Versions diffs - 0.5.0 → 0.6.0 - Mend

bigrig 0.5.0 → 0.6.0

Files changed (8) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +4 -0
data/Gemfile.lock +1 -1
data/lib/bigrig/docker_adapter.rb +2 -0
data/lib/bigrig/version.rb +1 -1
data/spec/bigrig/docker_adapter_spec.rb +9 -0
data/spec/vcr/Bigrig_DockerAdapter/_run/given_an_image_id_that_exists/and_a_name/sets_the_hostname.yml +178 -0
metadata +3 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7efe9f59950d19fdb1cdf53db16d27936f113506
-  data.tar.gz: 0b7009c17a3ac7afb42c453dce0c07a2a2002806
+  metadata.gz: 0cf7a6ed2dd2713e0fd26254356a17536be2e1b8
+  data.tar.gz: 65598d447d8baacc214190c42ea01a6447cab882
 SHA512:
-  metadata.gz: efc06d73bb0ef865abbe7a66b37194ea77f946cf2833c3206cb4c8f9655d64e90e355041f6bfe6c53ba483fa58314e9ce1326404d9f2e0b605fabec04a03c166
-  data.tar.gz: dce81ac7df035ba0e1135e6ecc532253772fd302b5e602c1334a37a5b8148d1364538b1b9a1181be51830e463e5f057556719d189c144a584ba042938cc6107a
+  metadata.gz: 112e51ae1834d5569e360284e14fbc460d7dfe6391ac536fe2e30158077c92dd854f6fc24fe38402ce9f20e44488dfc271f7109177bb7aa37a4c21052e792554
+  data.tar.gz: f162fc6323777c3cbdcc07c5a94f54ce23ba320d3cac971c3061c3e3b47c968bb53d7537ad6eb4e41a05c7b3a17fb0c8af4de5f4b10fe79120de4f80464b74db

data/CHANGELOG.md CHANGED Viewed

@@ -69,3 +69,7 @@ Add `volumes` attriute
 **BREAKING CHANGE**
 * removed wait_for from bigrig.json.  We now wait for the script at
   `/bigrig-wait.sh`, if present
+0.6.0
+=====
+* Set container hostname based on container hostname

data/Gemfile.lock CHANGED Viewed

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bigrig (0.5.0)
+    bigrig (0.6.0)
       colorize (= 0.7.5)
       docker-api (= 1.21.4)
       filewatcher (= 0.4.0)

data/lib/bigrig/docker_adapter.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 require 'docker'
+require 'socket'
 Excon.defaults[:ssl_verify_peer] = false
 Excon.defaults[:read_timeout] = 3600
@@ -106,6 +107,7 @@ module Bigrig
       def create_container(args)
         Docker::Container.create(
           'Env' => (args[:env] || {}).map { |n, v| "#{n}=#{v}" },
+          'Hostname' => "#{Socket.gethostname}-DOCKER-#{args[:name]}",
           'Image' => args[:image_id],
           'name' => args[:name],
           'ExposedPorts' => exposed_ports(args[:ports])

data/lib/bigrig/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Bigrig
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/spec/bigrig/docker_adapter_spec.rb CHANGED Viewed

@@ -292,6 +292,11 @@ module Bigrig
           # strip the leading '/' from the json name
           let(:container_name) { container.json['Name'][1..-1] }
+          let(:container_hostname) { container.json['Config']['Hostname'] }
+          before do
+            allow(Socket).to receive(:gethostname).and_return 'hostname'
+          end
           after { Docker::Container.get(name).kill!.delete }
@@ -299,6 +304,10 @@ module Bigrig
             expect(running?).to be true
             expect(container_name).to eq name
           end
+          it 'sets the hostname', :vcr do
+            expect(container_hostname).to eq 'hostname-DOCKER-and_a_name'
+          end
         end
         context 'and a name and ports' do

data/spec/vcr/Bigrig_DockerAdapter/_run/given_an_image_id_that_exists/and_a_name/sets_the_hostname.yml ADDED Viewed

@@ -0,0 +1,178 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: "<DOCKER_HOST>/v1.16/containers/create?name=and_a_name"
+    body:
+      encoding: UTF-8
+      string: '{"Env":[],"Hostname":"hostname-DOCKER-and_a_name","Image":"hawknewton/show-env","ExposedPorts":{}}'
+    headers:
+      User-Agent:
+      - Swipely/Docker-API 1.21.4
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 201
+      message:
+    headers:
+      Content-Type:
+      - application/json
+      Date:
+      - Fri, 12 Jun 2015 00:42:49 GMT
+      Content-Length:
+      - '90'
+    body:
+      encoding: UTF-8
+      string: |
+        {"Id":"47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc","Warnings":null}
+    http_version:
+  recorded_at: Fri, 12 Jun 2015 00:42:49 GMT
+- request:
+    method: post
+    uri: "<DOCKER_HOST>/v1.16/containers/47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc/start"
+    body:
+      encoding: UTF-8
+      string: '{"Links":null,"ExtraHosts":[],"PortBindings":{},"VolumesFrom":null,"Binds":null}'
+    headers:
+      User-Agent:
+      - Swipely/Docker-API 1.21.4
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 204
+      message:
+    headers:
+      Date:
+      - Fri, 12 Jun 2015 00:42:49 GMT
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version:
+  recorded_at: Fri, 12 Jun 2015 00:42:49 GMT
+- request:
+    method: get
+    uri: "<DOCKER_HOST>/v1.16/containers/47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc/json"
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Swipely/Docker-API 1.21.4
+      Content-Type:
+      - text/plain
+  response:
+    status:
+      code: 200
+      message:
+    headers:
+      Content-Type:
+      - application/json
+      Date:
+      - Fri, 12 Jun 2015 00:42:49 GMT
+    body:
+      encoding: UTF-8
+      string: |
+        {"AppArmorProfile":"","Args":["-c","ruby /code/server.rb"],"Config":{"AttachStderr":false,"AttachStdin":false,"AttachStdout":false,"Cmd":null,"CpuShares":0,"Cpuset":"","Domainname":"","Entrypoint":["/bin/sh","-c","ruby /code/server.rb"],"Env":["PATH=/usr/local/bundle/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin","RUBY_MAJOR=2.1","RUBY_VERSION=2.1.3","GEM_HOME=/usr/local/bundle","BUNDLE_APP_CONFIG=/usr/local/bundle"],"ExposedPorts":{"80/tcp":{}},"Hostname":"hostname-DOCKER-and_a_name","Image":"hawknewton/show-env","Labels":{},"MacAddress":"","Memory":0,"MemorySwap":0,"NetworkDisabled":false,"OnBuild":null,"OpenStdin":false,"PortSpecs":null,"StdinOnce":false,"Tty":false,"User":"","Volumes":null,"WorkingDir":""},"Created":"2015-06-12T00:42:49.330021216Z","Driver":"aufs","ExecDriver":"native-0.2","ExecIDs":null,"HostConfig":{"Binds":null,"CapAdd":null,"CapDrop":null,"CgroupParent":"","ContainerIDFile":"","CpuShares":0,"CpusetCpus":"","Devices":null,"Dns":null,"DnsSearch":null,"ExtraHosts":[],"IpcMode":"","Links":null,"LogConfig":{"Config":null,"Type":"json-file"},"LxcConf":null,"Memory":0,"MemorySwap":0,"NetworkMode":"","PidMode":"","PortBindings":{},"Privileged":false,"PublishAllPorts":false,"ReadonlyRootfs":false,"RestartPolicy":{"MaximumRetryCount":0,"Name":""},"SecurityOpt":null,"Ulimits":null,"VolumesFrom":null},"HostnamePath":"/mnt/sda1/var/lib/docker/containers/47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc/hostname","HostsPath":"/mnt/sda1/var/lib/docker/containers/47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc/hosts","Id":"47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc","Image":"b9c5be3a918d80b0d898ed8eca3fc76f75c482b531238e539cb00f75bb4e12d2","LogPath":"/mnt/sda1/var/lib/docker/containers/47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc/47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc-json.log","MountLabel":"","Name":"/and_a_name","NetworkSettings":{"Bridge":"docker0","Gateway":"172.17.42.1","GlobalIPv6Address":"","GlobalIPv6PrefixLen":0,"IPAddress":"172.17.1.188","IPPrefixLen":16,"IPv6Gateway":"","LinkLocalIPv6Address":"fe80::42:acff:fe11:1bc","LinkLocalIPv6PrefixLen":64,"MacAddress":"02:42:ac:11:01:bc","PortMapping":null,"Ports":{"80/tcp":null}},"Path":"/bin/sh","ProcessLabel":"","ResolvConfPath":"/mnt/sda1/var/lib/docker/containers/47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc/resolv.conf","RestartCount":0,"State":{"Dead":false,"Error":"","ExitCode":0,"FinishedAt":"0001-01-01T00:00:00Z","OOMKilled":false,"Paused":false,"Pid":13813,"Restarting":false,"Running":true,"StartedAt":"2015-06-12T00:42:49.716092538Z"},"Volumes":{},"VolumesRW":{}}
+    http_version:
+  recorded_at: Fri, 12 Jun 2015 00:42:49 GMT
+- request:
+    method: get
+    uri: "<DOCKER_HOST>/v1.16/containers/47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc/json"
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Swipely/Docker-API 1.21.4
+      Content-Type:
+      - text/plain
+  response:
+    status:
+      code: 200
+      message:
+    headers:
+      Content-Type:
+      - application/json
+      Date:
+      - Fri, 12 Jun 2015 00:42:49 GMT
+    body:
+      encoding: UTF-8
+      string: |
+        {"AppArmorProfile":"","Args":["-c","ruby /code/server.rb"],"Config":{"AttachStderr":false,"AttachStdin":false,"AttachStdout":false,"Cmd":null,"CpuShares":0,"Cpuset":"","Domainname":"","Entrypoint":["/bin/sh","-c","ruby /code/server.rb"],"Env":["PATH=/usr/local/bundle/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin","RUBY_MAJOR=2.1","RUBY_VERSION=2.1.3","GEM_HOME=/usr/local/bundle","BUNDLE_APP_CONFIG=/usr/local/bundle"],"ExposedPorts":{"80/tcp":{}},"Hostname":"hostname-DOCKER-and_a_name","Image":"hawknewton/show-env","Labels":{},"MacAddress":"","Memory":0,"MemorySwap":0,"NetworkDisabled":false,"OnBuild":null,"OpenStdin":false,"PortSpecs":null,"StdinOnce":false,"Tty":false,"User":"","Volumes":null,"WorkingDir":""},"Created":"2015-06-12T00:42:49.330021216Z","Driver":"aufs","ExecDriver":"native-0.2","ExecIDs":null,"HostConfig":{"Binds":null,"CapAdd":null,"CapDrop":null,"CgroupParent":"","ContainerIDFile":"","CpuShares":0,"CpusetCpus":"","Devices":null,"Dns":null,"DnsSearch":null,"ExtraHosts":[],"IpcMode":"","Links":null,"LogConfig":{"Config":null,"Type":"json-file"},"LxcConf":null,"Memory":0,"MemorySwap":0,"NetworkMode":"","PidMode":"","PortBindings":{},"Privileged":false,"PublishAllPorts":false,"ReadonlyRootfs":false,"RestartPolicy":{"MaximumRetryCount":0,"Name":""},"SecurityOpt":null,"Ulimits":null,"VolumesFrom":null},"HostnamePath":"/mnt/sda1/var/lib/docker/containers/47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc/hostname","HostsPath":"/mnt/sda1/var/lib/docker/containers/47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc/hosts","Id":"47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc","Image":"b9c5be3a918d80b0d898ed8eca3fc76f75c482b531238e539cb00f75bb4e12d2","LogPath":"/mnt/sda1/var/lib/docker/containers/47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc/47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc-json.log","MountLabel":"","Name":"/and_a_name","NetworkSettings":{"Bridge":"docker0","Gateway":"172.17.42.1","GlobalIPv6Address":"","GlobalIPv6PrefixLen":0,"IPAddress":"172.17.1.188","IPPrefixLen":16,"IPv6Gateway":"","LinkLocalIPv6Address":"fe80::42:acff:fe11:1bc","LinkLocalIPv6PrefixLen":64,"MacAddress":"02:42:ac:11:01:bc","PortMapping":null,"Ports":{"80/tcp":null}},"Path":"/bin/sh","ProcessLabel":"","ResolvConfPath":"/mnt/sda1/var/lib/docker/containers/47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc/resolv.conf","RestartCount":0,"State":{"Dead":false,"Error":"","ExitCode":0,"FinishedAt":"0001-01-01T00:00:00Z","OOMKilled":false,"Paused":false,"Pid":13813,"Restarting":false,"Running":true,"StartedAt":"2015-06-12T00:42:49.716092538Z"},"Volumes":{},"VolumesRW":{}}
+    http_version:
+  recorded_at: Fri, 12 Jun 2015 00:42:49 GMT
+- request:
+    method: get
+    uri: "<DOCKER_HOST>/v1.16/containers/and_a_name/json"
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Swipely/Docker-API 1.21.4
+      Content-Type:
+      - text/plain
+  response:
+    status:
+      code: 200
+      message:
+    headers:
+      Content-Type:
+      - application/json
+      Date:
+      - Fri, 12 Jun 2015 00:42:49 GMT
+    body:
+      encoding: UTF-8
+      string: |
+        {"AppArmorProfile":"","Args":["-c","ruby /code/server.rb"],"Config":{"AttachStderr":false,"AttachStdin":false,"AttachStdout":false,"Cmd":null,"CpuShares":0,"Cpuset":"","Domainname":"","Entrypoint":["/bin/sh","-c","ruby /code/server.rb"],"Env":["PATH=/usr/local/bundle/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin","RUBY_MAJOR=2.1","RUBY_VERSION=2.1.3","GEM_HOME=/usr/local/bundle","BUNDLE_APP_CONFIG=/usr/local/bundle"],"ExposedPorts":{"80/tcp":{}},"Hostname":"hostname-DOCKER-and_a_name","Image":"hawknewton/show-env","Labels":{},"MacAddress":"","Memory":0,"MemorySwap":0,"NetworkDisabled":false,"OnBuild":null,"OpenStdin":false,"PortSpecs":null,"StdinOnce":false,"Tty":false,"User":"","Volumes":null,"WorkingDir":""},"Created":"2015-06-12T00:42:49.330021216Z","Driver":"aufs","ExecDriver":"native-0.2","ExecIDs":null,"HostConfig":{"Binds":null,"CapAdd":null,"CapDrop":null,"CgroupParent":"","ContainerIDFile":"","CpuShares":0,"CpusetCpus":"","Devices":null,"Dns":null,"DnsSearch":null,"ExtraHosts":[],"IpcMode":"","Links":null,"LogConfig":{"Config":null,"Type":"json-file"},"LxcConf":null,"Memory":0,"MemorySwap":0,"NetworkMode":"","PidMode":"","PortBindings":{},"Privileged":false,"PublishAllPorts":false,"ReadonlyRootfs":false,"RestartPolicy":{"MaximumRetryCount":0,"Name":""},"SecurityOpt":null,"Ulimits":null,"VolumesFrom":null},"HostnamePath":"/mnt/sda1/var/lib/docker/containers/47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc/hostname","HostsPath":"/mnt/sda1/var/lib/docker/containers/47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc/hosts","Id":"47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc","Image":"b9c5be3a918d80b0d898ed8eca3fc76f75c482b531238e539cb00f75bb4e12d2","LogPath":"/mnt/sda1/var/lib/docker/containers/47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc/47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc-json.log","MountLabel":"","Name":"/and_a_name","NetworkSettings":{"Bridge":"docker0","Gateway":"172.17.42.1","GlobalIPv6Address":"","GlobalIPv6PrefixLen":0,"IPAddress":"172.17.1.188","IPPrefixLen":16,"IPv6Gateway":"","LinkLocalIPv6Address":"fe80::42:acff:fe11:1bc","LinkLocalIPv6PrefixLen":64,"MacAddress":"02:42:ac:11:01:bc","PortMapping":null,"Ports":{"80/tcp":null}},"Path":"/bin/sh","ProcessLabel":"","ResolvConfPath":"/mnt/sda1/var/lib/docker/containers/47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc/resolv.conf","RestartCount":0,"State":{"Dead":false,"Error":"","ExitCode":0,"FinishedAt":"0001-01-01T00:00:00Z","OOMKilled":false,"Paused":false,"Pid":13813,"Restarting":false,"Running":true,"StartedAt":"2015-06-12T00:42:49.716092538Z"},"Volumes":{},"VolumesRW":{}}
+    http_version:
+  recorded_at: Fri, 12 Jun 2015 00:42:49 GMT
+- request:
+    method: post
+    uri: "<DOCKER_HOST>/v1.16/containers/47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc/kill"
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Swipely/Docker-API 1.21.4
+      Content-Type:
+      - text/plain
+  response:
+    status:
+      code: 204
+      message:
+    headers:
+      Date:
+      - Fri, 12 Jun 2015 00:42:50 GMT
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version:
+  recorded_at: Fri, 12 Jun 2015 00:42:49 GMT
+- request:
+    method: delete
+    uri: "<DOCKER_HOST>/v1.16/containers/47d3cc66c2563f000ba865e12c368f33da54101544e0f13749bc0168698b54cc"
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Swipely/Docker-API 1.21.4
+      Content-Type:
+      - text/plain
+  response:
+    status:
+      code: 204
+      message:
+    headers:
+      Date:
+      - Fri, 12 Jun 2015 00:42:50 GMT
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version:
+  recorded_at: Fri, 12 Jun 2015 00:42:50 GMT
+recorded_with: VCR 2.9.3

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigrig
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Hawk Newton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -290,6 +290,7 @@ files:
 - spec/vcr/Bigrig_DockerAdapter/_remove_container/when_the_container_is_running/raises_a_ContainerRunningError.yml
 - spec/vcr/Bigrig_DockerAdapter/_remove_image/when_the_image_doesnt_exist/raises_an_error.yml
 - spec/vcr/Bigrig_DockerAdapter/_remove_image/when_the_image_exists/removes_the_image.yml
+- spec/vcr/Bigrig_DockerAdapter/_run/given_an_image_id_that_exists/and_a_name/sets_the_hostname.yml
 - spec/vcr/Bigrig_DockerAdapter/_run/given_an_image_id_that_exists/and_a_name/starts_the_container_with_the_right_name.yml
 - spec/vcr/Bigrig_DockerAdapter/_run/given_an_image_id_that_exists/and_a_name_and_env_variables/starts_the_container_with_env_set.yml
 - spec/vcr/Bigrig_DockerAdapter/_run/given_an_image_id_that_exists/and_a_name_and_ports/starts_the_container_with_ports_exposed.yml