centurion 1.4.1 → 1.4.2

data/lib/centurion/version.rb

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

data/lib/tasks/deploy.rake

@@ -162,7 +162,11 @@ namespace :deploy do
   task :determine_image_id_from_first_server do
     on_each_docker_host do |target_server|
       image_detail = target_server.inspect_image(fetch(:image), fetch(:tag))
-      exact_image = image_detail["id"]
+
+      # Handle CamelCase in response from Docker API
+      # See https://github.com/newrelic/centurion/issues/85
+      exact_image = image_detail["id"] || image_detail["Id"]
+
       set :image_id, exact_image
       info "RESOLVED #{fetch(:image)}:#{fetch(:tag)} => #{exact_image[0..11]}"
       break
@@ -192,7 +196,10 @@ namespace :deploy do
   task :verify_image do
     on_each_docker_host do |target_server|
       image_detail = target_server.inspect_image(fetch(:image), fetch(:tag))
-      found_image_id = image_detail["id"]
+
+      # Handle CamelCase in response from Docker API
+      # See https://github.com/newrelic/centurion/issues/85
+      found_image_id = image_detail["id"] || image_detail["Id"]
 
       if found_image_id == fetch(:image_id)
         info "Image #{found_image_id[0..7]} found on #{target_server.hostname}"
@@ -200,8 +207,11 @@ namespace :deploy do
         raise "Did not find image #{fetch(:image_id)} on host #{target_server.hostname}!"
       end
 
+      # Again, handle CamelCase in response from Docker API
+      container_config = image_detail["container_config"] || image_detail["ContainerConfig"]
+
       # Print the container config
-      image_detail["container_config"].each_pair do |key,value|
+      container_config.each_pair do |key,value|
         info "\t#{key} => #{value.inspect}"
       end
     end

data/spec/dogestry_spec.rb

@@ -11,6 +11,13 @@ describe Centurion::Dogestry do
   }
   let(:registry) { Centurion::Dogestry.new(dogestry_options) }
   let(:repo) { 'google/golang' }
+  let(:pull_hosts) {
+    [
+      'tcp://host-1:2375',
+      'tcp://host-2:2375'
+    ]
+  }
+  let(:flags) { "-pullhosts #{pull_hosts.join(',')}"}
 
   describe '#aws_access_key_id' do
     it 'returns correct value' do
@@ -51,8 +58,8 @@ describe Centurion::Dogestry do
  describe '#pull' do
    it 'returns correct value' do
     if registry.which('dogestry')
-      expect(registry).to receive(:echo).with("dogestry pull #{registry.s3_url} #{repo}")
-      registry.pull(repo, {})
+      expect(registry).to receive(:echo).with("dogestry #{flags} pull #{registry.s3_url} #{repo}")
+      registry.pull(repo, pull_hosts)
     end
    end
  end

metadata

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