centurion 1.0.10 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3eb7f396991461f2a7e0db2fe83ff6209313233e
+  data.tar.gz: ee9f4bc48a899190fa48439353f5803523bbe2ec
+SHA512:
+  metadata.gz: e0f35cd1e2626d5fd1c582ae2397c07b9daa7f53ace494094eea423f02865cba1d2852202e90cba8d7e82357002613db2ae48ee9e7280b11a6d53b329905b1f4
+  data.tar.gz: 01577cabe24211a9e65df8d0e4a140fd18042fab6742d5e65ed567becea161bc2582179b8c86df11055a69234b21f43e5b536c9f36a088bf79af0f139ad39905

data/CONTRIBUTORS.md

@@ -6,6 +6,10 @@ Post-release
 
 Your name could be here!
 
+ * [Tom Dooner][tdooner]
+ * [Jonathan Chauncey][jchauncey]
+ * [Matt Sanford][mzsanford]
+
 Pre-release
 -----------
 
@@ -60,3 +64,6 @@ Contributor                                   | Commits    | Additions | Deletio
 [intjonathan]: https://github.com/intjonathan
 [duien]: https://github.com/duien
 [frankywahl]: https://github.com/frankywahl
+[tdooner]: https://github.com/tdooner
+[jchauncey]: https://github.com/jchauncey
+[mzsanford]: https://github.com/mzsanford

data/README.md

@@ -100,39 +100,47 @@ namespace :environment do
   task :common do
     set :image, 'example.com/newrelic/radio-radio'
     host 'docker-server-1.example.com'
-	host 'docker-server-2.example.com'
+    host 'docker-server-2.example.com'
   end
 
   desc 'Staging environment'
   task :staging => :common do
-	set_current_environment(:staging)
-	env_vars YOUR_ENV: 'staging'
-	env_vars MY_DB: 'radio-db.example.com'
+    set_current_environment(:staging)
+    env_vars YOUR_ENV: 'staging'
+    env_vars MY_DB: 'radio-db.example.com'
     host_port 10234, container_port: 9292
     host_port 10235, container_port: 9293
-	host_volume '/mnt/volume1', container_volume: '/mnt/volume2'
+    host_volume '/mnt/volume1', container_volume: '/mnt/volume2'
   end
 
   desc 'Production environment'
   task :production => :common do
-	set_current_environment(:production)
-	env_vars YOUR_ENV: 'production'
-	env_vars MY_DB: 'radio-db-prod.example.com'
+    set_current_environment(:production)
+    env_vars YOUR_ENV: 'production'
+    env_vars MY_DB: 'radio-db-prod.example.com'
     host_port 22234, container_port: 9292
     host_port 23235, container_port: 9293
+    command ['/bin/bash', '-c', '/path/to/server -e production']
   end
 end
 ```
 
 This sets up a staging and production environment and defines a `common` task
 that will be run in either case. Note the dependency call in the task
-definition for the `production` and `staging` tasks.  Additionally, it
-defines some host ports to map and sets which servers to deploy to. Some
-configuration will provided to the containers at startup time, in the form of
-environment variables.
+definition for the `production` and `staging` tasks.  Additionally, it defines
+some host ports to map, sets which servers to deploy to, and sets a custom
+command. Some configuration will be provided to the containers at startup time,
+in the form of environment variables.
 
-All of the DSL items (`host_port`, `host_volume`, `env_vars`, `host`) can be
-specified more than once and will append to the configuration.
+Most of the DSL items (`host_port`, `host_volume`, `env_vars`, `host`) can be
+specified more than once and will append to the configuration. However, there
+can only be one `command`; the last one will take priority.
+
+###Interpolation
+
+Currently there is one special string for interpolation that can be added to
+any `env_var` value in the DSL. `%DOCKER_HOST%` will be replaced with the
+current server's hostname in the environment variable at deployment time.
 
 Deploying
 ---------

data/bin/centurion

@@ -16,11 +16,6 @@ Rake.application.options.trace = true
 task_dir = File.expand_path(File.join(File.dirname(__FILE__), *%w{.. lib tasks}))
 Dir.glob(File.join(task_dir, '*.rake')).each { |file| load file }
 
-possible_environments = %w[development integration staging production local_integration]
-def possible_environments.to_s
-  join(', ').sub(/, (\w+)$/, ', or \1')
-end
-
 #
 # Trollop option setup
 #
@@ -28,17 +23,13 @@ require 'trollop'
 
 opts = Trollop::options do
   opt :project,     'project (blog, forums...)',                   type: String, required: true,  short: '-p'
-  opt :environment, "environment (#{possible_environments})",      type: String, required: true,  short: '-e'
+  opt :environment, "environment (production, staging...)",        type: String, required: true,  short: '-e'
   opt :action,      'action (deploy, list...)',                    type: String, default: 'list', short: '-a'
   opt :image,       'image (yourco/project...)',                   type: String, required: false, short: '-i'
   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])
-  Trollop::die :environment, "is unknown; must be #{possible_environments}"
+  opt :nopull,      'Skip the pull_image step',                    type: :flag, default: false, long: '--no-pull'
 end
 
 set_current_environment(opts[:environment].to_sym)
@@ -64,11 +55,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/'
+set :docker_registry, Centurion::DockerRegistry::OFFICIAL_URL unless any?(:docker_registry)
 
 # Specify a path to docker executable
 set :docker_path, opts[:docker_path]
 
-set :no_pull, opts[:no_pull]
+set :no_pull, opts[:nopull]
 
 invoke(opts[:action])

data/centurion.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
     runs them on a fleet of hosts with the correct environment variables, host
     mappings, and port mappings. Supports rolling deployments out of the box, and
     makes it easy to ship applications to Docker servers.
-    
+
     We're using it to run our production infrastructure.
   EOS
   spec.homepage      = 'https://github.com/newrelic/centurion'
@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec', '~> 2.14.0'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'simplecov'
 

data/lib/centurion/deploy.rb

@@ -67,7 +67,7 @@ module Centurion::Deploy
     return false unless response
     return true if response.status >= 200 && response.status < 300
 
-    warn "Got HTTP status: #{response.status}" 
+    warn "Got HTTP status: #{response.status}"
     false
   end
 
@@ -87,12 +87,14 @@ module Centurion::Deploy
     end
   end
 
-  def container_config_for(target_server, image_id, port_bindings=nil, env_vars=nil, volumes=nil)
+  def container_config_for(target_server, image_id, port_bindings=nil, env_vars=nil, volumes=nil, command=nil)
     container_config = {
       'Image'        => image_id,
       'Hostname'     => target_server.hostname,
     }
 
+    container_config.merge!('Cmd' => command) if command
+
     if port_bindings
       container_config['ExposedPorts'] ||= {}
       port_bindings.keys.each do |port|
@@ -101,7 +103,9 @@ module Centurion::Deploy
     end
 
     if env_vars
-      container_config['Env'] = env_vars.map { |k,v| "#{k}=#{v}" }
+      container_config['Env'] = env_vars.map do |k,v|
+        "#{k}=#{v.gsub('%DOCKER_HOSTNAME%', target_server.hostname)}"
+      end
     end
 
     if volumes
@@ -115,35 +119,39 @@ module Centurion::Deploy
     container_config
   end
 
-  def start_new_container(target_server, image_id, port_bindings, volumes, env_vars=nil)
-    container_config = container_config_for(target_server, image_id, port_bindings, env_vars, volumes)
-    start_container_with_config(target_server, volumes, port_bindings, container_config)
+  def start_new_container(target_server, image_id, port_bindings, volumes, env_vars=nil, command=nil, cidfile=nil)
+    container_config = container_config_for(target_server, image_id, port_bindings, env_vars, volumes, command)
+    start_container_with_config(target_server, volumes, port_bindings, container_config, cidfile)
   end
 
-  def launch_console(target_server, image_id, port_bindings, volumes, env_vars=nil)
-    container_config = container_config_for(target_server, image_id, port_bindings, env_vars, volumes).merge(
-      'Cmd'         => [ '/bin/bash' ],
+  def launch_console(target_server, image_id, port_bindings, volumes, env_vars=nil, cidfile=nil)
+    container_config = container_config_for(target_server, image_id, port_bindings, env_vars, volumes, ['/bin/bash']).merge(
       'AttachStdin' => true,
       'Tty'         => true,
       'OpenStdin'   => true,
     )
 
-    container = start_container_with_config(target_server, volumes, port_bindings, container_config)
+    container = start_container_with_config(target_server, volumes, port_bindings, container_config, cidfile)
 
     target_server.attach(container['Id'])
   end
 
   private
-  
-  def start_container_with_config(target_server, volumes, port_bindings, container_config)
+
+  def start_container_with_config(target_server, volumes, port_bindings, container_config, cidfile)
     info "Creating new container for #{container_config['Image'][0..7]}"
     new_container = target_server.create_container(container_config)
 
     host_config = {}
+
     # Map some host volumes if needed
     host_config['Binds'] = volumes if volumes && !volumes.empty?
+
     # Bind the ports
-    host_config['PortBindings'] = port_bindings 
+    host_config['PortBindings'] = port_bindings
+
+    # Assign cidfile
+    host_config['ContainerIDFile'] = cidfile if cidfile
 
     info "Starting new container #{new_container['Id'][0..7]}"
     target_server.start_container(new_container['Id'], host_config)

data/lib/centurion/deploy_dsl.rb

@@ -22,6 +22,10 @@ module Centurion::DeployDSL
     set(:hosts, current)
   end
 
+  def command(command)
+    set(:command, command)
+  end
+
   def localhost
     # DOCKER_HOST is like 'tcp://127.0.0.1:4243'
     docker_host_uri = URI.parse(ENV['DOCKER_HOST'] || "tcp://127.0.0.1")
@@ -34,7 +38,7 @@ module Centurion::DeployDSL
     require_options_keys(options,  [ :container_port ])
 
     add_to_bindings(
-      options[:host_ip] || '0.0.0.0', 
+      options[:host_ip] || '0.0.0.0',
       options[:container_port],
       port,
       options[:type] || 'tcp'

data/lib/centurion/docker_registry.rb

@@ -5,15 +5,18 @@ require 'uri'
 module Centurion; end
 
 class Centurion::DockerRegistry
+  OFFICIAL_URL = 'https://registry.hub.docker.com'
+
   def initialize(base_uri)
     @base_uri = base_uri
   end
-  
+
   def digest_for_tag(repository, tag)
     path = "/v1/repositories/#{repository}/tags/#{tag}"
-    $stderr.puts "GET: #{path.inspect}"
+    uri = uri_for_repository_path(repository, path)
+    $stderr.puts "GET: #{uri}"
     response = Excon.get(
-      @base_uri + path,
+      uri,
       :headers => { "Content-Type" => "application/json" }
     )
     raise response.inspect unless response.status == 200
@@ -23,12 +26,52 @@ class Centurion::DockerRegistry
     # refuses (possibly correctly) to handle
     JSON.load('[' + response.body + ']').first
   end
-  
+
   def repository_tags(repository)
     path = "/v1/repositories/#{repository}/tags"
-    $stderr.puts "GET: #{path.inspect}"
-    response = Excon.get(@base_uri + path)
+    uri = uri_for_repository_path(repository, path)
+    $stderr.puts "GET: #{uri.inspect}"
+    response = Excon.get(uri)
     raise response.inspect unless response.status == 200
-    JSON.load(response.body)
+
+    tags = JSON.load(response.body)
+
+    # The Docker Registry API[1]  specifies a result in the format
+    # { "[tag]" : "[image_id]" }. However, the official Docker registry returns a
+    # result like [{ "layer": "[image_id]", "name": "[tag]" }].
+    #
+    # So, we need to normalize the response to what the Docker Registry API
+    # specifies should be returned.
+    #
+    # [1]: https://docs.docker.com/v1.1/reference/api/registry_api/
+
+    if is_official_registry?(repository)
+      {}.tap do |hash|
+        tags.each do |tag|
+          hash[tag['name']] = tag['layer']
+        end
+      end
+    else
+      tags
+    end
+  end
+
+  private
+
+  def is_official_registry?(repository)
+    if @base_uri == OFFICIAL_URL
+      return !repository.match(/^[a-z0-9-]+.[a-z]+\//)
+    end
+    false
+  end
+
+  def uri_for_repository_path(repository, path)
+    if repository.match(/\A([a-z0-9-]+.[a-z]+)\/(.*)\z/)
+      host = $1
+      short_image_name = $2
+      "https://#{host}#{path.gsub(repository, short_image_name)}"
+    else
+      @base_uri + path
+    end
   end
 end

data/lib/centurion/docker_via_cli.rb

@@ -55,7 +55,7 @@ class Centurion::DockerViaCli
     validate_status(command)
   end
 
-  def run_with_echo( command )
+  def run_with_echo(command)
     $stdout.sync = true
     $stderr.sync = true
     IO.popen(command) do |io|

data/lib/centurion/version.rb

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

data/lib/tasks/deploy.rake

@@ -51,7 +51,8 @@ namespace :deploy do
         fetch(:image_id),
         fetch(:port_bindings),
         fetch(:binds),
-        fetch(:env_vars)
+        fetch(:env_vars),
+        fetch(:cidfile, '/etc/cidfile')
       )
     end
   end
@@ -63,7 +64,8 @@ namespace :deploy do
         fetch(:image_id),
         fetch(:port_bindings),
         fetch(:binds),
-        fetch(:env_vars)
+        fetch(:env_vars),
+        fetch(:cidfile, '/etc/cidfile')
       )
     end
   end
@@ -77,7 +79,8 @@ namespace :deploy do
         fetch(:image_id),
         fetch(:port_bindings),
         fetch(:binds),
-        fetch(:env_vars)
+        fetch(:env_vars),
+        fetch(:cidfile, '/etc/cidfile')
       )
 
       fetch(:port_bindings).each_pair do |container_port, host_ports|

data/spec/deploy_dsl_spec.rb

@@ -22,6 +22,12 @@ describe Centurion::DeployDSL do
     DeployDSLTest.on_each_docker_host { |h| recipient.ping(h.hostname) }
   end
 
+  it 'has a DSL method for specifying the start command' do
+    command = ['/bin/echo', 'hi']
+    DeployDSLTest.command command
+    expect(DeployDSLTest.fetch(:command)).to equal(command)
+  end
+
   it 'adds new env_vars to the existing ones' do
     DeployDSLTest.set(:env_vars, { 'SHAKESPEARE' => 'Hamlet' })
     DeployDSLTest.env_vars('DICKENS' => 'David Copperfield')

data/spec/deploy_spec.rb

@@ -9,8 +9,8 @@ describe Centurion::Deploy do
   let(:port)            { 8484 }
   let(:container)       { { 'Ports' => [{ 'PublicPort' => port }, 'Created' => Time.now.to_i ], 'Id' => '21adfd2ef2ef2349494a', 'Names' => [ 'name1' ] } }
   let(:endpoint)        { '/status/check' }
-  let(:test_deploy) do 
-    Object.new.tap do |o| 
+  let(:test_deploy) do
+    Object.new.tap do |o|
       o.send(:extend, Centurion::Deploy)
       o.send(:extend, Centurion::DeployDSL)
       o.send(:extend, Centurion::Logging)
@@ -84,7 +84,7 @@ describe Centurion::Deploy do
       test_deploy.stub(:warn)
       expect(test_deploy).to receive(:exit)
       expect(test_deploy).to receive(:sleep).with(0)
-       
+
       test_deploy.wait_for_http_status_ok(server, port, '/foo', 'image_id', 'chaucer', 0, 1)
       expect(test_deploy).to have_received(:info).with(/Waiting for the port/)
     end
@@ -95,7 +95,7 @@ describe Centurion::Deploy do
       test_deploy.stub(:error)
       test_deploy.stub(:warn)
       expect(test_deploy).to receive(:exit)
-       
+
       test_deploy.wait_for_http_status_ok(server, port, '/foo', 'image_id', 'chaucer', 1, 0)
       expect(test_deploy).to have_received(:info).with(/Waiting for the port/)
     end
@@ -144,91 +144,178 @@ describe Centurion::Deploy do
   end
 
   describe '#container_config_for' do
-    it 'works with env_vars provided' do
-      config = test_deploy.container_config_for(server, 'image_id', {}, 'FOO' => 'BAR')
+    let(:image_id) { 'image_id' }
+    let(:port_bindings) { nil }
+    let(:env) { nil }
+    let(:volumes) { nil }
+    let(:command) { nil }
+
+    it 'works without env_vars, port_bindings, or a command' do
+      config = test_deploy.container_config_for(server, image_id)
 
       expect(config).to be_a(Hash)
-      expect(config.keys).to match_array(%w{ Hostname Image Env ExposedPorts })
-      expect(config['Env']).to eq(['FOO=BAR'])
+      expect(config.keys).to match_array(%w{ Hostname Image })
     end
 
-    it 'works without env_vars or port_bindings' do
-      config = test_deploy.container_config_for(server, 'image_id')
+    context 'when port bindings are specified' do
+      let(:port_bindings) { {1234 => 80, 9876 => 80} }
 
-      expect(config).to be_a(Hash)
-      expect(config.keys).to match_array(%w{ Hostname Image })
+      it 'sets the ExposedPorts key in the config correctly' do
+        config = test_deploy.container_config_for(server, image_id, port_bindings)
+
+        expect(config['ExposedPorts']).to be_a(Hash)
+        expect(config['ExposedPorts'].keys).to eq port_bindings.keys
+      end
     end
 
-    it 'handles mapping host volumes' do
-      config = test_deploy.container_config_for(server, 'image_id', nil, nil, ["/tmp/foo:/tmp/chaucer"])
+    context 'when env vars are specified' do
+      let(:env) { { 'FOO' => 'BAR', 'BAZ' => '%DOCKER_HOSTNAME%.example.com' } }
 
-      expect(config).to be_a(Hash)
-      expect(config.keys).to match_array(%w{ Hostname Image Volumes VolumesFrom })
-      expect(config['Volumes']['/tmp/chaucer']).to eq({})
+      it 'sets the Env key in the config' do
+        config = test_deploy.container_config_for(server, image_id, port_bindings, env)
+
+        expect(config).to be_a(Hash)
+        expect(config.keys).to match_array(%w{ Hostname Image Env })
+        expect(config['Env']).to include('FOO=BAR')
+      end
+
+      it 'interpolates the hostname into env_vars' do
+        config = test_deploy.container_config_for(server, image_id, port_bindings, env)
+
+        expect(config['Env']).to include('BAZ=host1.example.com')
+      end
+    end
+
+    context 'when volumes are specified' do
+      let(:volumes) { ["/tmp/foo:/tmp/chaucer"] }
+
+      it 'sets the Volumes key in the config' do
+        config = test_deploy.container_config_for(server, image_id, port_bindings, env, volumes)
+
+        expect(config).to be_a(Hash)
+        expect(config.keys).to match_array(%w{ Hostname Image Volumes VolumesFrom })
+        expect(config['Volumes']['/tmp/chaucer']).to eq({})
+      end
+    end
+
+    context 'when a custom command is specified' do
+      let(:command) { ['/bin/echo', 'hi'] }
+
+      it 'sets the Cmd key in the config' do
+        config = test_deploy.container_config_for(server, image_id, port_bindings, env, volumes, command)
+
+        expect(config).to be_a(Hash)
+        expect(config.keys).to match_array(%w{ Hostname Image Cmd })
+        expect(config['Cmd']).to eq(command)
+      end
     end
+  end
+
+  describe '#start_container_with_config' do
+    let(:bindings) { {'80/tcp'=>[{'HostIp'=>'0.0.0.0', 'HostPort'=>'80'}]} }
+
+    it 'pass host_config to start_container' do
+      server.stub(:container_config_for).and_return({
+        'Image'        => 'image_id',
+        'Hostname'     => server.hostname,
+      })
+
+      server.stub(:create_container).and_return({
+        'Id' => 'abc123456'
+      })
 
-    it "exposes all ports" do
-      config = test_deploy.container_config_for(server, 'image_id', {1234 => 80, 9876 => 80})
+      server.stub(:inspect_container)
 
-      expect(config['ExposedPorts']).to be_a(Hash)
-      expect(config['ExposedPorts'].keys).to eq [1234, 9876]
+      expect(server).to receive(:start_container).with(
+        'abc123456',
+        {
+          'PortBindings' => bindings,
+          'ContainerIDFile' => '/etc/cidfile'
+        }
+      ).once
+
+      test_deploy.start_new_container(server, 'image_id', bindings, {}, nil, nil, '/etc/cidfile')
     end
   end
 
   describe '#start_new_container' do
     let(:bindings) { {'80/tcp'=>[{'HostIp'=>'0.0.0.0', 'HostPort'=>'80'}]} }
+    let(:env) { { 'FOO' => 'BAR' } }
+    let(:volumes) { ['/foo:/bar'] }
+    let(:command) { ['/bin/echo', 'hi'] }
 
     it 'configures the container' do
-      expect(test_deploy).to receive(:container_config_for).with(server, 'image_id', bindings, nil, {}).once
+      expect(test_deploy).to receive(:container_config_for).with(server, 'image_id', bindings, nil, {}, nil).once
+
       test_deploy.stub(:start_container_with_config)
 
-      test_deploy.start_new_container(server, 'image_id', bindings, {})
+      test_deploy.start_new_container(server, 'image_id', bindings, {}, nil)
+    end
+
+    it 'pass cidfile to start_container_with_config method' do
+      test_deploy.stub(:container_config_for)
+
+      expect(test_deploy).to receive(:start_container_with_config).with(server, anything(), bindings, nil, '/etc/cidfile').once
+
+      test_deploy.start_new_container(server, 'image_id', bindings, {}, nil, nil, '/etc/cidfile')
     end
 
     it 'starts the container' do
-      expect(test_deploy).to receive(:start_container_with_config).with(server, {}, anything(), anything())
+      expect(test_deploy).to receive(:start_container_with_config).with(server, {}, anything(), anything(), anything())
 
       test_deploy.start_new_container(server, 'image_id', bindings, {})
     end
 
     it 'ultimately asks the server object to do the work' do
       server.should_receive(:create_container).with(
-        hash_including({'Image'=>'image_id', 'Hostname'=>'host1', 'ExposedPorts'=>{'80/tcp'=>{}}})
+        hash_including(
+          'Image'=>'image_id',
+          'Hostname'=>'host1',
+          'ExposedPorts'=>{'80/tcp'=>{}},
+          'Cmd' => command,
+          'Env' => ['FOO=BAR'],
+          'Volumes' => {'/bar' => {}},
+        )
       ).and_return(container)
 
       server.should_receive(:start_container)
       server.should_receive(:inspect_container)
 
-      new_container = test_deploy.start_new_container(server, 'image_id', bindings, {})
+      new_container = test_deploy.start_new_container(server, 'image_id', bindings, volumes, env, command)
       expect(new_container).to eq(container)
     end
   end
 
   describe '#launch_console' do
     let(:bindings) { {'80/tcp'=>[{'HostIp'=>'0.0.0.0', 'HostPort'=>'80'}]} }
+    let(:volumes)  { nil }
+    let(:env)      { nil }
+    let(:command)  { nil }
+    let(:cidfile)  { nil }
 
     it 'configures the container' do
-      expect(test_deploy).to receive(:container_config_for).with(server, 'image_id', bindings, nil, {}).once
+      expect(test_deploy).to receive(:container_config_for).with(server, 'image_id', bindings, env, volumes, command).once
       test_deploy.stub(:start_container_with_config)
 
-      test_deploy.start_new_container(server, 'image_id', bindings, {})
+      test_deploy.start_new_container(server, 'image_id', bindings, volumes, env, command, cidfile)
     end
 
     it 'augments the container_config' do
-      expect(test_deploy).to receive(:start_container_with_config).with(server, {},
+      expect(test_deploy).to receive(:start_container_with_config).with(server, volumes,
         anything(),
-        hash_including('Cmd' => [ '/bin/bash' ], 'AttachStdin' => true , 'Tty' => true , 'OpenStdin' => true)
+        hash_including('Cmd' => [ '/bin/bash' ], 'AttachStdin' => true , 'Tty' => true , 'OpenStdin' => true),
+        anything()
       ).and_return({'Id' => 'shakespeare'})
 
-      test_deploy.launch_console(server, 'image_id', bindings, {})
+      test_deploy.launch_console(server, 'image_id', bindings, volumes, env)
     end
 
     it 'starts the console' do
       expect(test_deploy).to receive(:start_container_with_config).with(
-        server, {}, anything(), anything()
+        server, nil, anything(), anything(), anything()
       ).and_return({'Id' => 'shakespeare'})
 
-      test_deploy.launch_console(server, 'image_id', bindings, {})
+      test_deploy.launch_console(server, 'image_id', bindings, volumes, env)
       expect(server).to have_received(:attach).with('shakespeare')
     end
   end

data/spec/docker_registry_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+require 'centurion/docker_registry'
+
+describe Centurion::DockerRegistry do
+  let(:registry_url) { 'http://localhost/' }
+  let(:registry) { Centurion::DockerRegistry.new(registry_url) }
+
+  describe '#repository_tags' do
+    let(:repository) { 'foobar' }
+    let(:tag_name) { 'arbitrary_tag' }
+    let(:image_id) { 'deadbeef0000' }
+    let(:url) { any_args() }
+
+    before do
+      expect(Excon).to receive(:get).
+                       with(url).
+                       and_return(double(status: 200, body: response))
+    end
+
+    subject { registry.repository_tags(repository) }
+
+    context 'when given a response from the official Docker registry' do
+      let(:registry_url) { Centurion::DockerRegistry::OFFICIAL_URL }
+      let(:response) { <<-JSON.strip }
+        [{"layer": "#{image_id}", "name": "#{tag_name}"}]
+      JSON
+
+      it 'normalizes the response' do
+        expect(subject).to eq(tag_name => image_id)
+      end
+    end
+
+    context 'when given a response from the open-source Docker registry' do
+      let(:response) { <<-JSON.strip }
+        {"#{tag_name}": "#{image_id}"}
+      JSON
+
+      it 'normalizes the response' do
+        expect(subject).to eq(tag_name => image_id)
+      end
+    end
+
+    context 'when given the official Docker registry and a repository with a host name' do
+      let(:registry_url) { Centurion::DockerRegistry::OFFICIAL_URL }
+      let(:repository) { 'example.com/foobar' }
+
+      let(:response) { <<-JSON.strip }
+        {"#{tag_name}": "#{image_id}"}
+      JSON
+
+      let(:url) { 'https://example.com/v1/repositories/foobar/tags' }
+
+      it 'fetches from the image-referenced registry' do
+        expect(subject).to eq(tag_name => image_id)
+      end
+    end
+  end
+
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: centurion
 version: !ruby/object:Gem::Version
-  version: 1.0.10
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Nic Benders
@@ -21,134 +20,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.33'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.33'
 - !ruby/object:Gem::Dependency
   name: logger-colors
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -172,7 +155,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CONTRIBUTORS.md
 - Gemfile
 - LICENSE
@@ -198,6 +181,7 @@ files:
 - spec/capistrano_dsl_spec.rb
 - spec/deploy_dsl_spec.rb
 - spec/deploy_spec.rb
+- spec/docker_registry_spec.rb
 - spec/docker_server_group_spec.rb
 - spec/docker_server_spec.rb
 - spec/docker_via_api_spec.rb
@@ -208,27 +192,26 @@ files:
 homepage: https://github.com/newrelic/centurion
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A deployment tool for Docker. Takes containers from a Docker registry and
   runs them on a fleet of hosts with the correct environment variables, host mappings,
   and port mappings. Supports rolling deployments out of the box, and makes it easy
@@ -237,6 +220,7 @@ test_files:
 - spec/capistrano_dsl_spec.rb
 - spec/deploy_dsl_spec.rb
 - spec/deploy_spec.rb
+- spec/docker_registry_spec.rb
 - spec/docker_server_group_spec.rb
 - spec/docker_server_spec.rb
 - spec/docker_via_api_spec.rb