centurion 1.8.9 → 1.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8966e2e693a5e6dd465d8c656622937e5844aca
-  data.tar.gz: b7d314a3c53734bf240f1662c91ce8a69044faf0
+  metadata.gz: ec921ec16391c51e0941a6a9e2d6fe2e060155da
+  data.tar.gz: 5ee10d7e3028d1135e5fe4eb1f8075e1146e643c
 SHA512:
-  metadata.gz: d3b49c8b73ef7206922b8ccb700a14a43d53fa2a3b0a7f3d8706fc59a22041bbcbdad44d7af83a9fdf6372743ea558fdc919404d5d1f6ac94e08beae22bd2c6c
-  data.tar.gz: 9972af6f0db91ea3ecfb9eb977090822109fd78faf285d48d2d64b680f0edf757f97e004bd38c12048a2d13cf554fac83f88e1d379c55199d874e2e9f5fcba52
+  metadata.gz: f8a80e7c694b008596459d7ce7b05000c2a50e6d7e89d388e7589a59287059b2bd487b6dea8fb683e9d283f333e372854aa3900673094d98202e817e6b1bbe5d
+  data.tar.gz: cb23d715dff77b5cb3b0d20fe9d8e3e9dbb74f14c34322e4553024f098ba9b4cc6e6d833b96a355fd970400e9a95aa1a0624448d6e85f9cd928fa35166a1156c

data/README.md

@@ -173,6 +173,40 @@ deploy a project:
 ```
 With this, the container will be named something like `backend-4f692997`.
 
+### Container Labels
+
+You may add arbitrary labels to your containers by calling `labels` with a hash.
+The call is cumulative, so you may express patterns like:
+
+```ruby
+namespace :environment do
+  task :common do
+    set :image, 'example.com/newrelic/radio-radio'
+    host 'docker-server-1.example.com'
+    labels team: 'radio-ops'
+  end
+
+  desc 'Staging environment'
+  task :staging => :common do
+    labels environment: 'radio-staging'
+    env_vars YOUR_ENV: 'staging'
+  end
+end
+```
+
+This would result in the container having two labels, as shown in a 
+`docker inspect` example:
+
+```
+  "Labels": {
+    "team": "radio-ops",
+    "environment": "radio-staging"
+  }
+```
+
+Hash keys and values will be stringified, so you may pass any object with a 
+`#to_s` method.
+
 ### Container Hostnames
 
 If you don't specify a hostname to use inside your container, the container
@@ -215,8 +249,10 @@ set :network_mode, 'networkmode'
 Docker (and therefore Centurion) supports one of `bridge` (the default), `host`,
 and `container:<container-id>` for this argument.
 
-*Note:* While `host_port` remains required, the mappings specified in it are
-*ignored* when using `host` and `container...` network modes.
+In `host` and `container...` network modes, you may specify a 
+`host_port, container_port` mapping, however the port numbers will only be used
+for container health checks. The mapping itself, while still passed via the API,
+will be ignored by Docker.
 
 ### CGroup Resource Constraints
 

data/bin/centurion

@@ -55,7 +55,7 @@ invoke("environment:#{opts[:environment]}")
 set :image, opts[:image] if opts[:image]
 set :tag,   opts[:tag] if opts[:tag]
 set :hosts, opts[:hosts].split(",") if opts[:hosts]
-set :name,  opts[:project].gsub(/_/, '-')
+set :name,  opts[:project].gsub(/_/, '-') unless fetch(:name)
 
 # Override environment variables when specified
 if opts[:override_env]

data/lib/centurion/deploy.rb

@@ -7,7 +7,7 @@ module Centurion::Deploy
   FAILED_CONTAINER_VALIDATION = 100
 
   def stop_containers(target_server, service, timeout = 30)
-    old_containers = if service.public_ports.nil? || service.public_ports.empty?
+    old_containers = if service.public_ports.nil? || service.public_ports.empty? || service.network_mode == 'host'
       info "Looking for containers with names like #{service.name}"
       target_server.find_containers_by_name(service.name)
     else

data/lib/centurion/deploy_dsl.rb

@@ -20,6 +20,14 @@ module Centurion::DeployDSL
     set(:env_vars, current)
   end
 
+  def labels(new_labels)
+    current = fetch(:labels, {})
+    new_labels.each_pair do |new_key, new_value|
+      current[new_key.to_s] = new_value.to_s
+    end
+    set(:labels, current)
+  end
+
   def add_capability(new_cap_adds)
     if !valid_capability?(new_cap_adds)
       abort("Invalid capability addition #{new_cap_adds} specified.")

data/lib/centurion/service.rb

@@ -6,7 +6,7 @@ module Centurion
     extend ::Capistrano::DSL
 
     attr_accessor :command, :dns, :extra_hosts, :image, :name, :volumes, :port_bindings, :network_mode, :cap_adds, :cap_drops, :ipc_mode
-    attr_reader :memory, :cpu_shares, :env_vars
+    attr_reader :memory, :cpu_shares, :env_vars, :labels
 
     def initialize(name)
       @name          = name
@@ -15,6 +15,7 @@ module Centurion
       @port_bindings = []
       @cap_adds      = []
       @cap_drops     = []
+      @labels        = {}
       @network_mode  = 'bridge'
     end
 
@@ -38,6 +39,7 @@ module Centurion
         s.cpu_shares    = fetch(:cpu_shares, 0)
         s.ipc_mode      = fetch(:ipc_mode, nil)
 
+        s.add_labels(fetch(:labels, {}))
         s.add_env_vars(fetch(:env_vars, {}))
       end
     end
@@ -54,6 +56,10 @@ module Centurion
       @volumes << Volume.new(host_volume, container_volume)
     end
 
+    def add_labels(labels)
+      @labels.merge!(Hash[labels.map { |(k,v)| [ k.to_s, v.to_s ]}])
+    end
+
     def cap_adds=(capabilites)
       unless capabilites.is_a? Array
         raise ArgumentError, "invalid value for capability additions: #{capabilites}, value must be an array"
@@ -101,6 +107,7 @@ module Centurion
         c['Cmd'] = command if command
         c['Memory'] = memory if memory
         c['CpuShares'] = cpu_shares if cpu_shares
+        c['Labels'] = labels unless labels.nil? || labels.empty?
       end
 
       unless port_bindings.empty?

data/lib/centurion/version.rb

@@ -1,3 +1,3 @@
 module Centurion
-  VERSION = '1.8.9'
+  VERSION = '1.8.10'
 end

data/spec/deploy_dsl_spec.rb

@@ -40,6 +40,18 @@ describe Centurion::DeployDSL do
     )
   end
 
+  it 'adds new labels to the existing ones, as strings' do
+    DeployDSLTest.labels(Shakespeare: 'Hamlet')
+    DeployDSLTest.labels(Dickens: 'David Copperfield',
+                           Dickens_birth_year: 1812)
+
+    expect(DeployDSLTest.defined_service.labels).to eq(
+      'Shakespeare'        => 'Hamlet',
+      'Dickens'            => 'David Copperfield',
+      'Dickens_birth_year' => '1812'
+    )
+  end
+
   describe '#add_capability' do
     it 'adds one capability' do
       DeployDSLTest.add_capability 'IPC_LOCK'

data/spec/deploy_spec.rb

@@ -147,6 +147,22 @@ describe Centurion::Deploy do
 
       test_deploy.stop_containers(server, service)
     end
+
+    it 'calls stop_container on the right containers in host networking mode' do
+      service = Centurion::Service.new(:centurion)
+      service.network_mode = 'host'
+      service.add_port_bindings(8080, 80)
+
+      second_container = container.dup
+      second_container = container.dup.tap { |c| c['Id'] = c['Id'].sub(/49494/, '55555') }
+      containers = [ container, second_container ]
+
+      expect(server).to receive(:find_containers_by_name).with(:centurion).and_return(containers)
+      expect(server).to receive(:stop_container).with(container['Id'], 30).once
+      expect(server).to receive(:stop_container).with(second_container['Id'], 30).once
+
+      test_deploy.stop_containers(server, service)
+    end
   end
 
   describe '#wait_for_load_balancer_check_interval' do

data/spec/service_spec.rb

@@ -6,6 +6,7 @@ describe Centurion::Service do
   let(:service)  { Centurion::Service.new(:redis) }
   let(:hostname) { 'shakespeare' }
   let(:image)    { 'redis' }
+  let(:labels)   { { 'test' => '123' } }
 
   it 'creates a service from the environment' do
     extend Capistrano::DSL
@@ -15,6 +16,7 @@ describe Centurion::Service do
     set(:hostname, hostname)
     set(:binds, [ Centurion::Service::Volume.new('/foo', '/foo/bar') ])
     set(:port_bindings, [ Centurion::Service::PortBinding.new(12340, 80, 'tcp') ])
+    set(:labels, labels)
 
     svc = Centurion::Service.from_env
     expect(svc.name).to eq('mycontainer')
@@ -24,6 +26,7 @@ describe Centurion::Service do
     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)
+    expect(svc.labels).to eq(labels)
   end
 
   it 'starts with a command' do
@@ -70,6 +73,12 @@ describe Centurion::Service do
     expect(service.env_vars).to eq(SLAVE_OF: '127.0.0.1', USE_AOF: '1')
   end
 
+  it 'has labels and flattens them all to text' do
+    service.add_labels(labels)
+    service.add_labels(another: 'label')
+    expect(service.labels).to eq(labels.merge('another' => 'label'))
+  end
+
   it 'has volume bindings' do
     service.add_volume('/volumes/redis/data', '/data')
     service.add_volume('/volumes/redis/config', '/config')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: centurion
 version: !ruby/object:Gem::Version
-  version: 1.8.9
+  version: 1.8.10
 platform: ruby
 authors:
 - Nic Benders
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop