centurion 1.9.2 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a616e149340434eb681b993b0fe0503f91dbe0dc
-  data.tar.gz: '096241cce242fff7b357fe942488f044f39b6cb0'
+  metadata.gz: b0e77b37bcb7efd62a50dd92c69364667c196592
+  data.tar.gz: e95dbfec1e39272cc02616dca556d809ead0ed43
 SHA512:
-  metadata.gz: 1f4a17f93aebad77f2a8c59c8a3ceabe58c11bea7d1d4be7c188c4b0264c95b6390e7a622c388809d1ab3e6621a7c3745351b5098ef54f330dc755cd9fe5500b
-  data.tar.gz: 136b293f1392c85086d25d28fd61fe7523dafeda29598703c4d37b0c70680fce848a9d56b7be09e592220f6aa9aad9d1b2b8d17ca213cdf3dd2eae1d56b7e642
+  metadata.gz: 952974644249e8f679725f253469168a1ae54843a110e7916bfcb75e06d0b694996c7a203da91914c3e6fd8e4848acbf0021917f9621b7cae7ad7cdb6039afc1
+  data.tar.gz: 48a37f571045722257bc4a026be4baa2788a274bf84c0470693b283100dcc4c182108fbcff85457270c59dafca1a6d1a6e986293ff6c6a447ec00a3317feb039

data/README.md

@@ -271,6 +271,17 @@ In `host` and `container...` network modes, you may specify a
 for container health checks. The mapping itself, while still passed via the API,
 will be ignored by Docker.
 
+### PID modes
+
+You may specify the PID mode you would like a container to use via:
+
+```ruby
+set :pid_mode, 'pidmode'
+```
+
+Docker (and therefore Centurion) supports one of nothing (the default), `host`,
+and `container:<container-id>` for this argument.
+
 ### CGroup Resource Constraints
 
 Limits on memory and CPU can be specified with the `memory` and `cpu_shares`

data/lib/centurion/service.rb

@@ -5,7 +5,7 @@ module Centurion
   class Service
     extend ::Capistrano::DSL
 
-    attr_accessor :command, :dns, :extra_hosts, :image, :name, :volumes, :port_bindings, :network_mode, :cap_adds, :cap_drops, :ipc_mode, :security_opt
+    attr_accessor :command, :dns, :extra_hosts, :image, :name, :volumes, :port_bindings, :network_mode, :pid_mode, :cap_adds, :cap_drops, :ipc_mode, :security_opt
     attr_reader :memory, :cpu_shares, :env_vars, :labels
 
     def initialize(name)
@@ -35,6 +35,7 @@ module Centurion
         s.volumes       = fetch(:binds, [])
         s.port_bindings = fetch(:port_bindings, [])
         s.network_mode  = fetch(:network_mode, 'bridge')
+        s.pid_mode      = fetch(:pid_mode, nil)
         s.command       = fetch(:command, nil)
         s.memory        = fetch(:memory, 0)
         s.cpu_shares    = fetch(:cpu_shares, 0)
@@ -76,10 +77,6 @@ module Centurion
       @cap_drops = capabilites
     end
 
-    def network_mode=(mode)
-      @network_mode = mode
-    end
-
     def memory=(bytes)
       if !bytes || !is_a_uint64?(bytes)
         raise ArgumentError, "invalid value for cgroup memory constraint: #{bytes}, value must be a between 0 and 18446744073709551615"
@@ -159,6 +156,9 @@ module Centurion
       # Set the network mode
       host_config['NetworkMode'] = network_mode
 
+      # Set the pid mode if specified
+      host_config['PidMode'] = pid_mode if pid_mode
+
       # DNS if specified
       host_config['Dns'] = dns if dns
 

data/lib/centurion/version.rb

@@ -1,3 +1,3 @@
 module Centurion
-  VERSION = '1.9.2'
+  VERSION = '1.10.0'
 end

data/spec/service_spec.rb

@@ -18,6 +18,8 @@ describe Centurion::Service do
     set(:port_bindings, [ Centurion::Service::PortBinding.new(12340, 80, 'tcp') ])
     set(:labels, labels)
     set(:security_opt, ['seccomp=unconfined'])
+    set(:network_mode, 'host')
+    set(:pid_mode, 'host')
 
     svc = Centurion::Service.from_env
     expect(svc.name).to eq('mycontainer')
@@ -29,6 +31,8 @@ describe Centurion::Service do
     expect(svc.port_bindings.first.container_port).to eq(80)
     expect(svc.labels).to eq(labels)
     expect(svc.security_opt).to eq(['seccomp=unconfined'])
+    expect(svc.network_mode).to eq('host')
+    expect(svc.pid_mode).to eq('host')
   end
 
   it 'starts with a command' do
@@ -64,6 +68,14 @@ describe Centurion::Service do
     expect(service.dns).to eq('redis.example.com')
   end
 
+  it 'has a default network mode' do
+    expect(service.network_mode).to eq('bridge')
+  end
+
+  it 'has no default pid mode' do
+    expect(service.pid_mode).to be(nil)
+  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')
@@ -309,4 +321,35 @@ describe Centurion::Service do
    })
   end
 
+  it 'builds docker configuration for container-linked pids' do
+    service.pid_mode = 'container:a2e8937b'
+    expect(service.build_host_config(Centurion::Service::RestartPolicy.new('on-failure', 50))).to eq({
+      'Binds' => [],
+      'CapAdd' => [],
+      'CapDrop' => [],
+      'NetworkMode' => 'bridge',
+      'PidMode' => 'container:a2e8937b',
+      'PortBindings' => {},
+       'RestartPolicy' => {
+         'Name' => 'on-failure',
+         'MaximumRetryCount' => 50
+      }
+   })
+  end
+
+  it 'builds docker configuration for host pids' do
+    service.pid_mode = 'host'
+    expect(service.build_host_config(Centurion::Service::RestartPolicy.new('on-failure', 50))).to eq({
+      'Binds' => [],
+      'CapAdd' => [],
+      'CapDrop' => [],
+      'NetworkMode' => 'bridge',
+      'PidMode' => 'host',
+      'PortBindings' => {},
+       'RestartPolicy' => {
+         'Name' => 'on-failure',
+         'MaximumRetryCount' => 50
+      }
+   })
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: centurion
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.10.0
 platform: ruby
 authors:
 - Nic Benders
@@ -21,7 +21,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-27 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -291,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: A deployment tool for Docker. Takes containers from a Docker registry and