centurion 1.4.0 → 1.4.1

data/lib/centurion/deploy.rb

@@ -138,19 +138,40 @@ module Centurion::Deploy
 
   private
 
+  # By default we always use on-failure policy.
+  def build_host_config_restart_policy(host_config={})
+    host_config['RestartPolicy'] = {}
+
+    restart_policy_name = fetch(:restart_policy_name) || 'on-failure'
+    restart_policy_name = 'on-failure' unless ["always", "on-failure", "no"].include?(restart_policy_name)
+
+    restart_policy_max_retry_count = fetch(:restart_policy_max_retry_count) || 10
+
+    host_config['RestartPolicy']['Name'] = restart_policy_name
+    host_config['RestartPolicy']['MaximumRetryCount'] = restart_policy_max_retry_count if restart_policy_name == 'on-failure'
+
+    host_config
+  end
+
   def start_container_with_config(target_server, volumes, port_bindings, container_config)
     info "Creating new container for #{container_config['Image'][0..7]}"
     new_container = target_server.create_container(container_config, fetch(:name))
 
     host_config = {}
+
     # Map some host volumes if needed
     host_config['Binds'] = volumes if volumes && !volumes.empty?
+
     # Bind the ports
     host_config['PortBindings'] = port_bindings
+
     # DNS if specified
     dns = fetch(:custom_dns)
     host_config['Dns'] = dns if dns
 
+    # Restart Policy
+    host_config = build_host_config_restart_policy(host_config)
+
     info "Starting new container #{new_container['Id'][0..7]}"
     target_server.start_container(new_container['Id'], host_config)
 

data/lib/centurion/version.rb

@@ -1,3 +1,3 @@
 module Centurion
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

data/spec/deploy_spec.rb

@@ -241,7 +241,110 @@ describe Centurion::Deploy do
         'abc123456',
         {
           'PortBindings' => bindings,
-          'Dns' => '8.8.8.8'
+          'Dns' => '8.8.8.8',
+          'RestartPolicy' => {
+            'Name' => 'on-failure',
+            'MaximumRetryCount' => 10
+          }
+        }
+      ).once
+
+      test_deploy.start_new_container(server, 'image_id', bindings, {}, nil, nil)
+    end
+  end
+
+  describe '#start_container_with_restart_policy' do
+    let(:bindings) { {'80/tcp'=>[{'HostIp'=>'0.0.0.0', 'HostPort'=>'80'}]} }
+
+    before do
+      allow(server).to receive(:container_config_for).and_return({
+        'Image'        => 'image_id',
+        'Hostname'     => server.hostname,
+      })
+
+      allow(server).to receive(:create_container).and_return({
+        'Id' => 'abc123456'
+      })
+
+      allow(server).to receive(:inspect_container)
+    end
+
+    it 'pass no restart policy to start_container' do
+      expect(server).to receive(:start_container).with(
+        'abc123456',
+        {
+          'PortBindings' => bindings,
+          'RestartPolicy' => {
+            'Name' => 'on-failure',
+            'MaximumRetryCount' => 10
+          }
+        }
+      ).once
+
+      test_deploy.start_new_container(server, 'image_id', bindings, {}, nil, nil)
+    end
+
+    it 'pass "always" restart policy to start_container' do
+      allow(test_deploy).to receive(:fetch).with(:restart_policy_name).and_return('always')
+
+      expect(server).to receive(:start_container).with(
+        'abc123456',
+        {
+          'PortBindings' => bindings,
+          'RestartPolicy' => {
+            'Name' => 'always'
+          }
+        }
+      ).once
+
+      test_deploy.start_new_container(server, 'image_id', bindings, {}, nil, nil)
+    end
+
+    it 'pass "on-failure with 50 retries" restart policy to start_container' do
+      allow(test_deploy).to receive(:fetch).with(:restart_policy_name).and_return('on-failure')
+      allow(test_deploy).to receive(:fetch).with(:restart_policy_max_retry_count).and_return(50)
+
+      expect(server).to receive(:start_container).with(
+        'abc123456',
+        {
+          'PortBindings' => bindings,
+          'RestartPolicy' => {
+            'Name' => 'on-failure',
+            'MaximumRetryCount' => 50
+          }
+        }
+      ).once
+
+      test_deploy.start_new_container(server, 'image_id', bindings, {}, nil, nil)
+    end
+
+    it 'pass "no" restart policy to start_container' do
+      allow(test_deploy).to receive(:fetch).with(:restart_policy_name).and_return('no')
+
+      expect(server).to receive(:start_container).with(
+        'abc123456',
+        {
+          'PortBindings' => bindings,
+          'RestartPolicy' => {
+            'Name' => 'no'
+          }
+        }
+      ).once
+
+      test_deploy.start_new_container(server, 'image_id', bindings, {}, nil, nil)
+    end
+
+    it 'pass "garbage" restart policy to start_container' do
+      allow(test_deploy).to receive(:fetch).with(:restart_policy_name).and_return('garbage')
+
+      expect(server).to receive(:start_container).with(
+        'abc123456',
+        {
+          'PortBindings' => bindings,
+          'RestartPolicy' => {
+            'Name' => 'on-failure',
+            'MaximumRetryCount' => 10
+          }
         }
       ).once
 

data/spec/dogestry_spec.rb

@@ -50,8 +50,10 @@ describe Centurion::Dogestry do
 
  describe '#pull' do
    it 'returns correct value' do
-     expect(registry).to receive(:echo).with("dogestry #{flags} pull #{registry.s3_url} #{repo}")
-     registry.pull(repo, pull_hosts)
+    if registry.which('dogestry')
+      expect(registry).to receive(:echo).with("dogestry pull #{registry.s3_url} #{repo}")
+      registry.pull(repo, {})
+    end
    end
  end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: centurion
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -21,7 +21,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop