centurion 1.0.7 → 1.0.8

data/lib/centurion/deploy.rb

@@ -87,7 +87,7 @@ module Centurion::Deploy
     end
   end
 
-  def container_config_for(target_server, image_id, port_bindings=nil, env_vars=nil)
+  def container_config_for(target_server, image_id, port_bindings=nil, env_vars=nil, volumes=nil)
     container_config = {
       'Image'        => image_id,
       'Hostname'     => target_server.hostname,
@@ -101,16 +101,24 @@ module Centurion::Deploy
       container_config['Env'] = env_vars.map { |k,v| "#{k}=#{v}" }
     end
 
+    if volumes
+      container_config['Volumes'] = volumes.inject({}) do |memo, v|
+        memo[v.split(/:/).last] = {}
+        memo
+      end
+      container_config['VolumesFrom'] = 'parent'
+    end
+
     container_config
   end
 
   def start_new_container(target_server, image_id, port_bindings, volumes, env_vars=nil)
-    container_config = container_config_for(target_server, image_id, port_bindings, env_vars)
+    container_config = container_config_for(target_server, image_id, port_bindings, env_vars, volumes)
     start_container_with_config(target_server, volumes, port_bindings, container_config)
   end
 
   def launch_console(target_server, image_id, port_bindings, volumes, env_vars=nil)
-    container_config = container_config_for(target_server, image_id, port_bindings, env_vars).merge(
+    container_config = container_config_for(target_server, image_id, port_bindings, env_vars, volumes).merge(
       'Cmd'         => [ '/bin/bash' ],
       'AttachStdin' => true,
       'Tty'         => true,
@@ -128,11 +136,11 @@ module Centurion::Deploy
     info "Creating new container for #{container_config['Image'][0..7]}"
     new_container = target_server.create_container(container_config)
 
-    host_config = { 
-      'PortBindings' => port_bindings 
-    }
+    host_config = {}
     # Map some host volumes if needed
     host_config['Binds'] = volumes if volumes && !volumes.empty?
+    # Bind the ports
+    host_config['PortBindings'] = port_bindings 
 
     info "Starting new container #{new_container['Id'][0..7]}"
     target_server.start_container(new_container['Id'], host_config)

data/lib/centurion/docker_via_api.rb

@@ -61,7 +61,7 @@ class Centurion::DockerViaApi
   end
 
   def create_container(configuration)
-    path = "/v1.7/containers/create"
+    path = "/v1.10/containers/create"
     response = Excon.post(
       @base_uri + path,
       :body => configuration.to_json,
@@ -72,7 +72,7 @@ class Centurion::DockerViaApi
   end
 
   def start_container(container_id, configuration)
-    path = "/v1.7/containers/#{container_id}/start"
+    path = "/v1.10/containers/#{container_id}/start"
     response = Excon.post(
       @base_uri + path,
       :body => configuration.to_json,

data/lib/centurion/version.rb

@@ -1,3 +1,3 @@
 module Centurion
-  VERSION = '1.0.7'
+  VERSION = '1.0.8'
 end

data/spec/deploy_spec.rb

@@ -158,13 +158,21 @@ describe Centurion::Deploy do
       expect(config).to be_a(Hash)
       expect(config.keys).to match_array(%w{ Hostname Image })
     end
+
+    it 'handles mapping host volumes' do
+      config = test_deploy.container_config_for(server, 'image_id', nil, nil, ["/tmp/foo:/tmp/chaucer"])
+
+      expect(config).to be_a(Hash)
+      expect(config.keys).to match_array(%w{ Hostname Image Volumes VolumesFrom })
+      expect(config['Volumes']['/tmp/chaucer']).to eq({})
+    end
   end
 
   describe '#start_new_container' do
     let(:bindings) { {'80/tcp'=>[{'HostIp'=>'0.0.0.0', 'HostPort'=>'80'}]} }
 
     it 'configures the container' do
-      expect(test_deploy).to receive(:container_config_for).with(server, 'image_id', bindings, nil).once
+      expect(test_deploy).to receive(:container_config_for).with(server, 'image_id', bindings, nil, {}).once
       test_deploy.stub(:start_container_with_config)
 
       test_deploy.start_new_container(server, 'image_id', bindings, {})
@@ -193,7 +201,7 @@ describe Centurion::Deploy do
     let(:bindings) { {'80/tcp'=>[{'HostIp'=>'0.0.0.0', 'HostPort'=>'80'}]} }
 
     it 'configures the container' do
-      expect(test_deploy).to receive(:container_config_for).with(server, 'image_id', bindings, nil).once
+      expect(test_deploy).to receive(:container_config_for).with(server, 'image_id', bindings, nil, {}).once
       test_deploy.stub(:start_container_with_config)
 
       test_deploy.start_new_container(server, 'image_id', bindings, {})

data/spec/docker_via_api_spec.rb

@@ -5,7 +5,7 @@ describe Centurion::DockerViaApi do
   let(:hostname) { 'example.com' }
   let(:port) { '4243' }
   let(:api) { Centurion::DockerViaApi.new(hostname, port) }
-  let(:excon_uri) { "http://#{hostname}:#{port}/v1.7" }
+  let(:excon_uri) { "http://#{hostname}:#{port}/" }
   let(:json_string) { '[{ "Hello": "World" }]' }
   let(:json_value) { JSON.load(json_string) }
   let(:inspected_containers) do
@@ -18,21 +18,21 @@ describe Centurion::DockerViaApi do
 
   it 'lists processes' do
     expect(Excon).to receive(:get).
-                     with(excon_uri + "/containers/json").
+                     with(excon_uri + "v1.7" + "/containers/json").
                      and_return(double(body: json_string, status: 200))
     expect(api.ps).to eq(json_value)
   end
 
   it 'lists all processes' do
     expect(Excon).to receive(:get).
-                     with(excon_uri + "/containers/json?all=1").
+                     with(excon_uri + "v1.7" + "/containers/json?all=1").
                      and_return(double(body: json_string, status: 200))
     expect(api.ps(all: true)).to eq(json_value)
   end
 
   it 'inspects an image' do
     expect(Excon).to receive(:get).
-                     with(excon_uri + "/images/foo:bar/json",
+                     with(excon_uri + "v1.7" + "/images/foo:bar/json",
                           headers: {'Accept' => 'application/json'}).
                      and_return(double(body: json_string, status: 200))
     expect(api.inspect_image('foo', 'bar')).to eq(json_value)
@@ -42,7 +42,7 @@ describe Centurion::DockerViaApi do
     configuration_as_json = double
     configuration = double(:to_json => configuration_as_json)
     expect(Excon).to receive(:post).
-                         with(excon_uri + "/containers/create",
+                         with(excon_uri + "v1.10" + "/containers/create",
                               body: configuration_as_json,
                               headers: {'Content-Type' => 'application/json'}).
                          and_return(double(body: json_string, status: 201))
@@ -53,7 +53,7 @@ describe Centurion::DockerViaApi do
     configuration_as_json = double
     configuration = double(:to_json => configuration_as_json)
     expect(Excon).to receive(:post).
-                         with(excon_uri + "/containers/12345/start",
+                         with(excon_uri + "v1.10" + "/containers/12345/start",
                               body: configuration_as_json,
                               headers: {'Content-Type' => 'application/json'}).
                          and_return(double(body: json_string, status: 204))
@@ -62,34 +62,34 @@ describe Centurion::DockerViaApi do
 
   it 'stops a container' do
     expect(Excon).to receive(:post).
-                     with(excon_uri + "/containers/12345/stop?t=30").
+                     with(excon_uri + "v1.7" + "/containers/12345/stop?t=30").
                      and_return(double(status: 204))
     api.stop_container('12345')
   end
 
   it 'inspects a container' do
     expect(Excon).to receive(:get).
-                         with(excon_uri + "/containers/12345/json").
+                         with(excon_uri + "v1.7" + "/containers/12345/json").
                          and_return(double(body: json_string, status: 200))
     expect(api.inspect_container('12345')).to eq(json_value)
   end
 
   it 'removes a container' do
     expect(Excon).to receive(:delete).
-                         with(excon_uri + "/containers/12345").
+                         with(excon_uri + "v1.7" + "/containers/12345").
                          and_return(double(status: 204))
     expect(api.remove_container('12345')).to eq(true)
   end
 
   it 'lists old containers for a port' do
     expect(Excon).to receive(:get).
-                         with(excon_uri + "/containers/json?all=1").
+                         with(excon_uri + "v1.7" + "/containers/json?all=1").
                          and_return(double(body: inspected_containers.to_json, status: 200))
     expect(Excon).to receive(:get).
-                         with(excon_uri + "/containers/123/json").
+                         with(excon_uri + "v1.7" + "/containers/123/json").
                          and_return(double(body: inspected_container_on_port("123", 8485).to_json, status: 200))
     expect(Excon).to receive(:get).
-                         with(excon_uri + "/containers/789/json").
+                         with(excon_uri + "v1.7" + "/containers/789/json").
                          and_return(double(body: inspected_container_on_port("789", 8486).to_json, status: 200))
 
     expect(api.old_containers_for_port(8485)).to eq([{"Id" => "123", "Status" => "Exit 0"}])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: centurion
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors: