centurion 1.0.9 → 1.0.10

data/README.md

@@ -154,6 +154,24 @@ must respond with a valid response in the 200 status range.
 $ bundle exec centurion -p radio-radio -e staging -a rolling_deploy
 ````
 
+**Rolling Deployment Settings**:
+You can change the following settings in your config to tune how the rolling
+deployment behaves. Each of these is controlled with `set(:var_name, 'value')`.
+These can be different for each environment or put into a common block if they
+are the same everywhere. Settings are per-project.
+
+ * `rolling_deploy_check_interval` => Controls how long Centurion will wait after
+    seeing a container as up before moving on to the next one. This should be
+    slightly longer than your load balancer check interval. Value in seconds.
+    Defaults to 5 seconds.
+ * `rolling_deploy_wait_time` => The amount of time to wait between unsuccessful
+    health checks before retrying. Value in seconds. Defaults to 5 seconds.
+ * `rolling_deploy_retries` => The number of times to retry a health check on
+   the container once it is running. This count multiplied by the
+   `rolling_deployment_wait_time` is the total time Centurion will wait for
+   an individual container to come up before giving up as a failure. Defaults
+   to 24 attempts.
+
 ###Deploy a project to a fleet of Docker servers
 
 This will hard stop, then start containers on all the specified hosts. This

data/bin/centurion

@@ -22,7 +22,7 @@ def possible_environments.to_s
 end
 
 #
-# Trollup option setup
+# Trollop option setup
 #
 require 'trollop'
 
@@ -34,6 +34,7 @@ opts = Trollop::options do
   opt :tag,         'tag (latest...)',                             type: String, required: false, short: '-t'
   opt :hosts,       'hosts, comma separated',                      type: String, required: false, short: '-h'
   opt :docker_path, 'path to docker executable (default: docker)', type: String, default: 'docker', short: '-d'
+  opt :no_pull,     'Skip the pull_image step',                    type: :flag, default: false, long: '--no-pull'
 end
 
 unless possible_environments.include?(opts[:environment])
@@ -63,8 +64,11 @@ set :hosts, opts[:hosts].split(",") if opts[:hosts]
 
 # Default tag should be "latest"
 set :tag, 'latest' unless any?(:tag)
+set :docker_registry, 'https://registry.hub.docker.com/'
 
 # Specify a path to docker executable
 set :docker_path, opts[:docker_path]
 
+set :no_pull, opts[:no_pull]
+
 invoke(opts[:action])

data/lib/centurion/deploy.rb

@@ -94,7 +94,10 @@ module Centurion::Deploy
     }
 
     if port_bindings
-      container_config['ExposedPorts'] = { port_bindings.keys.first => {} }
+      container_config['ExposedPorts'] ||= {}
+      port_bindings.keys.each do |port|
+        container_config['ExposedPorts'][port] = {}
+      end
     end
 
     if env_vars

data/lib/centurion/docker_registry.rb

@@ -5,12 +5,11 @@ require 'uri'
 module Centurion; end
 
 class Centurion::DockerRegistry
-  def initialize()
-    # @base_uri = "https://staging-docker-registry.nr-ops.net"
-    @base_uri = 'http://chi-docker-registry.nr-ops.net'
+  def initialize(base_uri)
+    @base_uri = base_uri
   end
   
-  def digest_for_tag( repository, tag)
+  def digest_for_tag(repository, tag)
     path = "/v1/repositories/#{repository}/tags/#{tag}"
     $stderr.puts "GET: #{path.inspect}"
     response = Excon.get(
@@ -25,8 +24,8 @@ class Centurion::DockerRegistry
     JSON.load('[' + response.body + ']').first
   end
   
-  def respository_tags( respository )
-    path = "/v1/repositories/#{respository}/tags"
+  def repository_tags(repository)
+    path = "/v1/repositories/#{repository}/tags"
     $stderr.puts "GET: #{path.inspect}"
     response = Excon.get(@base_uri + path)
     raise response.inspect unless response.status == 200

data/lib/centurion/docker_via_api.rb

@@ -34,7 +34,7 @@ class Centurion::DockerViaApi
 
   def old_containers_for_port(host_port)
     old_containers = ps(all: true).select do |container|
-      container["Status"] =~ /^Exit /
+      container["Status"] =~ /^(Exit |Exited)/
     end.select do |container|
       inspected = inspect_container container["Id"]
       container_listening_on_port?(inspected, host_port)
@@ -104,7 +104,7 @@ class Centurion::DockerViaApi
     port_bindings = container['HostConfig']['PortBindings']
     return false unless port_bindings
 
-    port_bindings.values.flatten.any? do |port_binding|
+    port_bindings.values.flatten.compact.any? do |port_binding|
       port_binding['HostPort'].to_i == port.to_i
     end
   end

data/lib/centurion/docker_via_cli.rb

@@ -52,10 +52,7 @@ class Centurion::DockerViaCli
     end
 
     output_thread.kill
-
-    unless $?.success?
-      raise "The command failed with a non-zero exit status: #{$?.exitstatus}"
-    end
+    validate_status(command)
   end
 
   def run_with_echo( command )
@@ -64,8 +61,12 @@ class Centurion::DockerViaCli
     IO.popen(command) do |io|
       io.each_char { |char| print char }
     end
+    validate_status(command)
+  end
+
+  def validate_status(command)
     unless $?.success?
-      raise "The command failed with a non-zero exit status: #{$?.exitstatus}"
+      raise "The command failed with a non-zero exit status: #{$?.exitstatus}. Command: '#{command}'"
     end
   end
 end

data/lib/centurion/version.rb

@@ -1,3 +1,3 @@
 module Centurion
-  VERSION = '1.0.9'
+  VERSION = '1.0.10'
 end

data/lib/tasks/deploy.rake

@@ -103,7 +103,7 @@ namespace :deploy do
   end
 
   task :determine_image_id do
-    registry = Centurion::DockerRegistry.new()
+    registry = Centurion::DockerRegistry.new(fetch(:docker_registry))
     exact_image = registry.digest_for_tag(fetch(:image), fetch(:tag))
     set :image_id, exact_image
     $stderr.puts "RESOLVED #{fetch(:image)}:#{fetch(:tag)} => #{exact_image[0..11]}"
@@ -120,6 +120,10 @@ namespace :deploy do
   end
 
   task :pull_image do
+    if fetch(:no_pull)
+      info "--no-pull option specified: skipping pull"
+      next
+    end
     $stderr.puts "Fetching image #{fetch(:image)}:#{fetch(:tag)} IN PARALLEL\n"
 
     target_servers = Centurion::DockerServerGroup.new(fetch(:hosts), fetch(:docker_path))

data/lib/tasks/list.rake

@@ -24,8 +24,8 @@ namespace :list do
 
   task :tags do
     begin
-      registry = Centurion::DockerRegistry.new()
-      tags = registry.respository_tags(fetch(:image))
+      registry = Centurion::DockerRegistry.new(fetch(:docker_registry))
+      tags = registry.repository_tags(fetch(:image))
       tags.each do |tag|
         puts "\t#{tag[0]}\t-> #{tag[1][0..11]}"
       end

data/spec/deploy_spec.rb

@@ -166,6 +166,13 @@ describe Centurion::Deploy do
       expect(config.keys).to match_array(%w{ Hostname Image Volumes VolumesFrom })
       expect(config['Volumes']['/tmp/chaucer']).to eq({})
     end
+
+    it "exposes all ports" do
+      config = test_deploy.container_config_for(server, 'image_id', {1234 => 80, 9876 => 80})
+
+      expect(config['ExposedPorts']).to be_a(Hash)
+      expect(config['ExposedPorts'].keys).to eq [1234, 9876]
+    end
   end
 
   describe '#start_new_container' do

data/spec/docker_via_api_spec.rb

@@ -12,7 +12,7 @@ describe Centurion::DockerViaApi do
     [
       {"Id" => "123", "Status" => "Exit 0"},
       {"Id" => "456", "Status" => "Running blah blah"},
-      {"Id" => "789", "Status" => "Exit 1"},
+      {"Id" => "789", "Status" => "Exited 1 mins ago"},
     ]
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: centurion
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -21,7 +21,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop