centurion 1.6.0 → 1.8.0

data/spec/docker_server_spec.rb

@@ -11,7 +11,7 @@ describe Centurion::DockerServer do
        'Created' => 1414797234,
        'Id'      => '28970c706db0f69716af43527ed926acbd82581e1cef5e4e6ff152fce1b79972',
        'Image'   => 'centurion-test:latest',
-       'Names'   => ['/centurion-783aac4'],
+       'Names'   => ['/centurion-783aac48378283'],
        'Ports'   => [{'PrivatePort'=>80, 'Type'=>'tcp', 'IP'=>'0.0.0.0', 'PublicPort'=>23235}],
        'Status'  => 'Up 3 days'
      }
@@ -74,4 +74,19 @@ describe Centurion::DockerServer do
       expect(server.find_containers_by_name('fbomb')).to be_empty
     end
   end
+
+  context 'finding old containers' do
+    it 'finds stopped containers for the given service name' do
+      inspected_containers =
+        [
+            {"Id" => "123", "Names" => ["/centurion-1234567890abcd"], "Status" => "Exit 0"},
+            {"Id" => "456", "Names" => ["/centurion-2234567890abcd"], "Status" => "Running blah blah"},
+            {"Id" => "789", "Names" => ["/centurion-3234567890abcd"], "Status" => "Exited 1 mins ago"},
+            {"Id" => "918", "Names" => ["/fbomb-3234567890abcd"], "Status" => "Exited 1 mins ago"},
+        ]
+      allow(server).to receive(:ps).and_return(inspected_containers)
+
+      expect(server.old_containers_for_name('centurion').map { |c| c['Id'] }).to eq(["123", "789"])
+    end
+  end
 end

data/spec/docker_via_api_spec.rb

@@ -6,13 +6,6 @@ describe Centurion::DockerViaApi do
   let(:port) { '2375' }
   let(:json_string) { '[{ "Hello": "World" }]' }
   let(:json_value) { JSON.load(json_string) }
-  let(:inspected_containers) do
-    [
-      {"Id" => "123", "Status" => "Exit 0"},
-      {"Id" => "456", "Status" => "Running blah blah"},
-      {"Id" => "789", "Status" => "Exited 1 mins ago"},
-    ]
-  end
 
   context 'without TLS certificates' do
     let(:excon_uri) { "http://#{hostname}:#{port}/" }
@@ -81,6 +74,20 @@ describe Centurion::DockerViaApi do
       api.stop_container('12345')
     end
 
+    it 'restarts a container' do
+      expect(Excon).to receive(:post).
+                          with(excon_uri + "v1.10" + "/containers/12345/restart?t=30", {}).
+                          and_return(double(body: json_string, status: 204))
+      api.restart_container('12345')
+    end
+
+    it 'restarts a container with a custom timeout' do
+      expect(Excon).to receive(:post).
+                          with(excon_uri + "v1.10" + "/containers/12345/restart?t=300", {}).
+                          and_return(double(body: json_string, status: 204))
+      api.restart_container('12345', 300)
+    end
+
     it 'inspects a container' do
       expect(Excon).to receive(:get).
                            with(excon_uri + 'v1.7/containers/12345/json', {}).
@@ -95,20 +102,6 @@ describe Centurion::DockerViaApi do
       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 + 'v1.7/containers/json?all=1', {}).
-                           and_return(double(body: inspected_containers.to_json, status: 200))
-      expect(Excon).to receive(:get).
-                           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 + '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"}])
-    end
-
     it 'inspects an image' do
       expect(Excon).to receive(:get).
                        with(excon_uri + "v1.7" + "/images/foo:bar/json",
@@ -198,6 +191,24 @@ describe Centurion::DockerViaApi do
       api.stop_container('12345')
     end
 
+    it 'restarts a container' do
+      expect(Excon).to receive(:post).
+                        with(excon_uri + "v1.10" + "/containers/12345/restart?t=30",
+                            client_cert: '/certs/cert.pem',
+                            client_key: '/certs/key.pem').
+                        and_return(double(body: json_string, status: 204))
+      api.restart_container('12345')
+    end
+
+    it 'restarts a container with a custom timeout' do
+      expect(Excon).to receive(:post).
+                        with(excon_uri + "v1.10" + "/containers/12345/restart?t=300",
+                            client_cert: '/certs/cert.pem',
+                            client_key: '/certs/key.pem').
+                        and_return(double(body: json_string, status: 204))
+      api.restart_container('12345', 300)
+    end
+
     it 'inspects a container' do
       expect(Excon).to receive(:get).
                            with(excon_uri + 'v1.7/containers/12345/json',
@@ -215,26 +226,6 @@ describe Centurion::DockerViaApi do
                            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 + 'v1.7/containers/json?all=1',
-                                client_cert: '/certs/cert.pem',
-                                client_key: '/certs/key.pem').
-                           and_return(double(body: inspected_containers.to_json, status: 200))
-      expect(Excon).to receive(:get).
-                           with(excon_uri + 'v1.7/containers/123/json',
-                                client_cert: '/certs/cert.pem',
-                                client_key: '/certs/key.pem').
-                           and_return(double(body: inspected_container_on_port("123", 8485).to_json, status: 200))
-      expect(Excon).to receive(:get).
-                           with(excon_uri + 'v1.7/containers/789/json',
-                                client_cert: '/certs/cert.pem',
-                                client_key: '/certs/key.pem').
-                           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"}])
-    end
   end
 
    context 'with default TLS certificates' do
@@ -251,18 +242,4 @@ describe Centurion::DockerViaApi do
       expect(api.ps).to eq(json_value)
     end
   end
-
-  def inspected_container_on_port(id, port)
-    {
-      "Id" => id.to_s,
-      "HostConfig" => {
-        "PortBindings" => {
-          "80/tcp" => [
-            "HostIp" => "0.0.0.0",
-            "HostPort" => port.to_s
-          ]
-        }
-      }
-    }
-  end
 end

data/spec/service_spec.rb

@@ -0,0 +1,288 @@
+require 'spec_helper'
+require 'centurion/service'
+
+describe Centurion::Service do
+
+  let(:service)  { Centurion::Service.new(:redis) }
+  let(:hostname) { 'shakespeare' }
+  let(:image)    { 'redis' }
+
+  it 'creates a service from the environment' do
+    extend Capistrano::DSL
+    set_current_environment(:test)
+    set(:name, 'mycontainer')
+    set(:image, image)
+    set(:hostname, hostname)
+    set(:binds, [ Centurion::Service::Volume.new('/foo', '/foo/bar') ])
+    set(:port_bindings, [ Centurion::Service::PortBinding.new(12340, 80, 'tcp') ])
+
+    svc = Centurion::Service.from_env
+    expect(svc.name).to eq('mycontainer')
+    expect(svc.image).to eq(image)
+    expect(svc.dns).to be_nil
+    expect(svc.volumes.size).to eq(1)
+    expect(svc.volumes.first.host_volume).to eq('/foo')
+    expect(svc.port_bindings.size).to eq(1)
+    expect(svc.port_bindings.first.container_port).to eq(80)
+  end
+
+  it 'starts with a command' do
+    service.command = ['redis-server']
+    expect(service.command).to eq(['redis-server'])
+  end
+
+  it 'has memory bounds' do
+    service.memory = 1024
+    expect(service.memory).to eq(1024)
+  end
+
+  it 'rejects non-numeric memory bounds' do
+    expect(-> { service.memory = 'all' }).to raise_error
+  end
+
+  it 'has cpu shares bounds' do
+    service.cpu_shares = 512
+    expect(service.cpu_shares).to eq(512)
+  end
+
+  it 'rejects non-numeric cpu shares' do
+    expect(-> { service.cpu_shares = 'all' }).to raise_error
+  end
+
+  it 'has a custom dns association' do
+    service.dns = 'redis.example.com'
+    expect(service.dns).to eq('redis.example.com')
+  end
+
+  it 'boots from a docker image' do
+    service.image = 'registry.hub.docker.com/library/redis'
+    expect(service.image).to eq('registry.hub.docker.com/library/redis')
+  end
+
+  it 'has env vars' do
+    service.add_env_vars(SLAVE_OF: '127.0.0.1')
+    service.add_env_vars(USE_AOF: '1')
+    expect(service.env_vars).to eq(SLAVE_OF: '127.0.0.1', USE_AOF: '1')
+  end
+
+  it 'has volume bindings' do
+    service.add_volume('/volumes/redis/data', '/data')
+    service.add_volume('/volumes/redis/config', '/config')
+    expect(service.volumes).to eq([Centurion::Service::Volume.new('/volumes/redis/data', '/data'),
+                                   Centurion::Service::Volume.new('/volumes/redis/config', '/config')])
+  end
+
+  it 'has port mappings' do
+    service.add_port_bindings(8000, 6379, 'tcp', '127.0.0.1')
+    service.add_port_bindings(18000, 16379, 'tcp', '127.0.0.1')
+    expect(service.port_bindings).to eq([Centurion::Service::PortBinding.new(8000, 6379, 'tcp', '127.0.0.1'),
+                                         Centurion::Service::PortBinding.new(18000, 16379, 'tcp', '127.0.0.1')])
+  end
+
+  it 'builds a list of public ports for the service' do
+    service.add_port_bindings(8000, 6379, 'tcp', '127.0.0.1')
+    service.add_port_bindings(18000, 16379, 'tcp', '127.0.0.1')
+    expect(service.public_ports).to eq([8000, 18000])
+  end
+
+  context 'building a container configuration' do
+      service = Centurion::Service.new(:redis)
+      service.image = 'http://registry.hub.docker.com/library/redis'
+      service.command = ['redis-server', '--appendonly', 'yes']
+      service.memory = 1024
+      service.cpu_shares = 512
+      service.add_env_vars(SLAVE_OF: '127.0.0.2')
+      service.add_port_bindings(8000, 6379, 'tcp', '10.0.0.1')
+      service.network_mode = 'host'
+      service.add_volume('/volumes/redis.8000', '/data')
+
+    it 'builds a valid docker container configuration' do
+      expect(service.build_config('example.com')).to eq({
+        'Image' => 'http://registry.hub.docker.com/library/redis',
+        'Cmd' => ['redis-server', '--appendonly', 'yes'],
+        'Memory' => 1024,
+        'CpuShares' => 512,
+        'ExposedPorts' => {'6379/tcp' => {}},
+        'Env' => ['SLAVE_OF=127.0.0.2'],
+        'Volumes' => {'/data' => {}},
+
+        # TODO: Ignoring this for now because Docker 1.6
+        # https://github.com/newrelic/centurion/issues/117
+        # 'VolumesFrom' => 'parent'
+      })
+    end
+
+    it 'overrides the default hostname when passed a block' do
+      expect(service.build_config('example.com') { |s| "host.#{s}" }).to eq({
+        'Image' => 'http://registry.hub.docker.com/library/redis',
+        'Hostname' => 'host.example.com',
+        'Cmd' => ['redis-server', '--appendonly', 'yes'],
+        'Memory' => 1024,
+        'CpuShares' => 512,
+        'ExposedPorts' => {'6379/tcp' => {}},
+        'Env' => ['SLAVE_OF=127.0.0.2'],
+        'Volumes' => {'/data' => {}},
+
+        # TODO: Ignoring this for now because Docker 1.6
+        # https://github.com/newrelic/centurion/issues/117
+        # 'VolumesFrom' => 'parent'
+      })
+    end
+  end
+
+  it 'interpolates hostname into env variables' do
+    allow(Socket).to receive(:getaddrinfo).and_return([["AF_INET", 0, "93.184.216.34", "93.184.216.34", 2, 1, 6]])
+    service = Centurion::Service.new(:redis)
+    service.add_env_vars(HOST: '%DOCKER_HOSTNAME%')
+
+    expect(service.build_config('example.com')['Env']).to eq(['HOST=example.com'])
+  end
+
+  it 'interpolates host ip into env variables' do
+    allow(Socket).to receive(:getaddrinfo).and_return([["AF_INET", 0, "93.184.216.34", "93.184.216.34", 2, 1, 6]])
+    service = Centurion::Service.new(:redis)
+    service.add_env_vars(HOST: '%DOCKER_HOST_IP%')
+
+    expect(service.build_config('example.com')['Env']).to eq(['HOST=93.184.216.34'])
+  end
+
+  it 'does not blow up on non-string values' do
+    expect { service.add_env_vars(SOMETHING: true) }.not_to raise_error
+  end
+
+  it 'builds a valid docker host configuration' do
+    service = Centurion::Service.new(:redis)
+    service.dns = 'example.com'
+    service.add_port_bindings(8000, 6379)
+    service.cap_adds = ['IPC_BIND', 'NET_RAW']
+    service.cap_drops = ['DAC_OVERRIDE']
+    service.add_volume('/volumes/redis.8000', '/data')
+
+    expect(service.build_host_config(Centurion::Service::RestartPolicy.new('on-failure', 10))).to eq({
+      'Binds' => ['/volumes/redis.8000:/data'],
+      'CapAdd' => ['IPC_BIND', 'NET_RAW'],
+      'CapDrop' => ['DAC_OVERRIDE'],
+      'PortBindings' => {
+        '6379/tcp' => [{'HostPort' => '8000'}]
+      },
+      'NetworkMode' => 'bridge',
+      'Dns' => 'example.com',
+      'RestartPolicy' => {
+        'Name' => 'on-failure',
+        'MaximumRetryCount' => 10
+      }
+    })
+  end
+
+  it 'ignores garbage restart policy' do
+    service = Centurion::Service.new(:redis)
+
+    expect(service.build_host_config(Centurion::Service::RestartPolicy.new('garbage'))).to eq({
+       'Binds' => [],
+       'CapAdd' => [],
+       'CapDrop' => [],
+       'PortBindings' => {},
+       'NetworkMode' => 'bridge',
+       'RestartPolicy' => {
+         'Name' => 'on-failure',
+         'MaximumRetryCount' => 10
+       }
+     })
+  end
+
+  it 'accepts "no" restart policy' do
+    service = Centurion::Service.new(:redis)
+
+    expect(service.build_host_config(Centurion::Service::RestartPolicy.new('no'))).to eq({
+      'Binds' => [],
+      'CapAdd' => [],
+      'CapDrop' => [],
+      'PortBindings' => {},
+      'NetworkMode' => 'bridge',
+       'RestartPolicy' => {
+         'Name' => 'no',
+       }
+     })
+  end
+
+  it 'accepts "always" restart policy' do
+    service = Centurion::Service.new(:redis)
+
+    expect(service.build_host_config(Centurion::Service::RestartPolicy.new('always'))).to eq({
+      'Binds' => [],
+      'CapAdd' => [],
+      'CapDrop' => [],
+      'PortBindings' => {},
+      'NetworkMode' => 'bridge',
+       'RestartPolicy' => {
+         'Name' => 'always',
+       }
+     })
+  end
+
+  it 'accepts "on-failure" restart policy with retry count' do
+    service = Centurion::Service.new(:redis)
+
+    expect(service.build_host_config(Centurion::Service::RestartPolicy.new('on-failure', 50))).to eq({
+      'Binds' => [],
+      'CapAdd' => [],
+      'CapDrop' => [],
+      'NetworkMode' => 'bridge',
+      'PortBindings' => {},
+       'RestartPolicy' => {
+         'Name' => 'on-failure',
+         'MaximumRetryCount' => 50
+       }
+     })
+  end
+
+  it 'builds docker configuration for volume binds' do
+    service.add_volume('/volumes/redis/data', '/data')
+    expect(service.volume_binds_config).to eq(['/volumes/redis/data:/data'])
+  end
+
+  it 'builds docker configuration for port bindings' do
+    service.add_port_bindings(8000, 6379, 'tcp', '127.0.0.1')
+    expect(service.port_bindings_config).to eq({
+      '6379/tcp' => [{'HostPort' => '8000', 'HostIp' => '127.0.0.1'}]
+    })
+  end
+
+  it 'builds docker configuration for port bindings without host ip' do
+    service.add_port_bindings(8000, 6379, 'tcp')
+    expect(service.port_bindings_config).to eq({
+      '6379/tcp' => [{'HostPort' => '8000'}]
+    })
+  end
+
+  it 'builds docker configuration for container-linked networking' do
+    service.network_mode = 'container:a2e8937b'
+    expect(service.build_host_config(Centurion::Service::RestartPolicy.new('on-failure', 50))).to eq({
+      'Binds' => [],
+      'CapAdd' => [],
+      'CapDrop' => [],
+      'NetworkMode' => 'container:a2e8937b',
+      'PortBindings' => {},
+       'RestartPolicy' => {
+         'Name' => 'on-failure',
+         'MaximumRetryCount' => 50
+      }
+   })
+  end
+
+  it 'builds docker configuration for host networking' do
+    service.network_mode = 'host'
+    expect(service.build_host_config(Centurion::Service::RestartPolicy.new('on-failure', 50))).to eq({
+      'Binds' => [],
+      'CapAdd' => [],
+      'CapDrop' => [],
+      'NetworkMode' => 'host',
+      'PortBindings' => {},
+       'RestartPolicy' => {
+         'Name' => 'on-failure',
+         'MaximumRetryCount' => 50
+      }
+   })
+  end
+
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: centurion
 version: !ruby/object:Gem::Version
-  version: 1.6.0
-  prerelease: 
+  version: 1.8.0
 platform: ruby
 authors:
 - Nic Benders
@@ -21,134 +20,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.33'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.33'
 - !ruby/object:Gem::Dependency
   name: logger-colors
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -172,7 +155,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CONTRIBUTORS.md
 - Gemfile
 - LICENSE
@@ -192,6 +175,7 @@ files:
 - lib/centurion/docker_via_cli.rb
 - lib/centurion/dogestry.rb
 - lib/centurion/logging.rb
+- lib/centurion/service.rb
 - lib/centurion/shell.rb
 - lib/centurion/version.rb
 - lib/core_ext/numeric_bytes.rb
@@ -209,33 +193,33 @@ files:
 - spec/docker_via_cli_spec.rb
 - spec/dogestry_spec.rb
 - spec/logging_spec.rb
+- spec/service_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers/capistrano_dsl_matchers.rb
 - spec/support/matchers/exit_code_matches.rb
 homepage: https://github.com/newrelic/centurion
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A deployment tool for Docker. Takes containers from a Docker registry and
   runs them on a fleet of hosts with the correct environment variables, host mappings,
   and port mappings. Supports rolling deployments out of the box, and makes it easy
@@ -251,6 +235,7 @@ test_files:
 - spec/docker_via_cli_spec.rb
 - spec/dogestry_spec.rb
 - spec/logging_spec.rb
+- spec/service_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers/capistrano_dsl_matchers.rb
 - spec/support/matchers/exit_code_matches.rb