centurion 1.8.7 → 1.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 826ffcff6537706e1e3c3098e11ed44fb3a5e720
-  data.tar.gz: 2def18407e0b1fd89eb3b25859121394ae86abd9
+  metadata.gz: 5d6a3ace96ff33ba0c059c1c0147e33f20120569
+  data.tar.gz: ae5f4c1b8f87f86ccdf0a2535772c27f3511677e
 SHA512:
-  metadata.gz: f7ea4eaca3ae871e7bb443fa273cfb52c791125bf82b2257943ff844be552431cd182608d5461493b5e9ade45e2b718dfc4fa5fb807443a4ae495a8af97013c9
-  data.tar.gz: 30a236769d57b729f60d8067f71d5ad6c64d6fd8b2dff13e35b01d4b5d331243839370599a6cc1eb9a36b42523f6e54de0f074de65c6f58b8013784e630a1227
+  metadata.gz: 9d3e9aedb002d7d000fecd8ba45a8ade798752f3da06c1cfe3522caf1ab7c891ee33e83686470e90878d8b24ec83a612fc313b233b0622dcfadacfddcc7a08b6
+  data.tar.gz: 6eaa259d3cd1b9a5ad45e12bc2991905e870085dc09d66649ba8e5d4a7dca8ee5526da721c2978b10dcccbc450dc8a1fe0786e503656dad747b7c96e3e793873

data/CONTRIBUTORS.md

@@ -14,6 +14,8 @@ Your name could be here!
  * [Mark Borcherding][markborcherding]
  * [Nick Laferriere][laferrieren]
  * [Hugo Chinchilla][hugochinchilla]
+ * [Dan Selans][dselans]
+ * [Dan Young][idleyoungman]
 
 Pre-release
 -----------

data/README.md

@@ -23,7 +23,7 @@ Commercial Docker Registry Providers:
 - [Quay.io](https://quay.io) from the CoreOS team
 
 Open-source:
-- The [Docker registry](https://github.com/dotcloud/docker-registry) project,
+- The [Docker Distribution](https://github.com/docker/distribution) project,
   built and maintained by Docker. You host this yourself.
 - (*NEW!*) [Dogestry](https://github.com/dogestry/dogestry) is an
   s3-backed Docker registry alternative that removes the requirement to set up
@@ -37,8 +37,6 @@ one roll-up commit of all our internal code. But all internal development will
 now be on public GitHub. See the CONTRIBUTORS file for the contributors to the
 original internal project.
 
-The **current stable release** is 1.8.0.
-
 Installation
 ------------
 
@@ -150,7 +148,7 @@ You can cause your container to be started with a specific DNS server
 IP address (the equivalent of `docker run --dns 172.17.42.1 ...`) like this:
 ```ruby
   task :production => :common do
-    set :dns, '172.17.42.1'
+    set :dns, [ '172.17.42.1' ]
     # ...
   end
 ```

data/lib/centurion/docker_server.rb

@@ -21,7 +21,11 @@ class Centurion::DockerServer
   def initialize(host, docker_path, tls_params = {})
     @docker_path = docker_path
     @hostname, @port = host.split(':')
-    @port ||= '2375'
+    @port ||= if tls_params.empty?
+      '2375'
+    else
+      '2376'
+    end
     @tls_params = tls_params
   end
 

data/lib/centurion/docker_via_api.rb

@@ -49,7 +49,9 @@ class Centurion::DockerViaApi
     path = @docker_api_version + "/containers/#{container_id}/stop?t=#{timeout}"
     response = Excon.post(
       @base_uri + path,
-      tls_excon_arguments
+      tls_excon_arguments.merge(
+        read_timeout: timeout
+      )
     )
     raise response.inspect unless response.status == 204
     true
@@ -150,6 +152,7 @@ class Centurion::DockerViaApi
     Excon.defaults[:nonblock]        = false
     Excon.defaults[:tcp_nodelay]     = true
     Excon.defaults[:ssl_ca_file]     = @tls_args[:tlscacert]
+    Excon.defaults[:ssl_verify_peer] = false
   end
 
   def default_tls_args(tls_enabled)

data/lib/centurion/docker_via_cli.rb

@@ -68,7 +68,7 @@ class Centurion::DockerViaCli
 
   def build_command(action, destination)
     command = "#{@docker_path} -H=#{@docker_host}"
-    command << tls_parameters
+    command << tls_parameters || ''
     command << case action
                when :pull then ' pull '
                when :logs then ' logs -f '

data/lib/centurion/version.rb

@@ -1,3 +1,3 @@
 module Centurion
-  VERSION = '1.8.7'
+  VERSION = '1.8.8'
 end

data/lib/tasks/deploy.rake

@@ -31,6 +31,7 @@ end
 
 task :stop => ['deploy:stop']
 task :enter_container => ['deploy:enter_container']
+task :logs => ['deploy:logs']
 
 namespace :dev do
   task :export_only do
@@ -125,6 +126,13 @@ namespace :deploy do
     end
   end
 
+  task :logs do
+    Centurion::DockerServerGroup.new(fetch(:hosts, []), fetch(:docker_path)).each_in_parallel do |host|
+      container_id = host.ps.select { |c| c['Names'].select { |n| n =~ /#{fetch(:name)}/ } }.first['Id']
+      host.tail(container_id)
+    end
+  end
+
   task :rolling_deploy do
     on_each_docker_host do |server|
       service = defined_service

data/spec/docker_via_api_spec.rb

@@ -63,14 +63,14 @@ describe Centurion::DockerViaApi do
 
     it 'stops a container' do
       expect(Excon).to receive(:post).
-                       with(excon_uri + "v1.12" + "/containers/12345/stop?t=300", {}).
+                       with(excon_uri + "v1.12" + "/containers/12345/stop?t=300", {read_timeout: 300}).
                        and_return(double(status: 204))
       api.stop_container('12345', 300)
     end
 
     it 'stops a container with a custom timeout' do
       expect(Excon).to receive(:post).
-                       with(excon_uri + "v1.12" + "/containers/12345/stop?t=30", {}).
+                       with(excon_uri + "v1.12" + "/containers/12345/stop?t=30", {read_timeout: 30}).
                        and_return(double(status: 204))
       api.stop_container('12345')
     end
@@ -178,7 +178,8 @@ describe Centurion::DockerViaApi do
       expect(Excon).to receive(:post).
                        with(excon_uri + "v1.12" + "/containers/12345/stop?t=300",
                             client_cert: '/certs/cert.pem',
-                            client_key: '/certs/key.pem').
+                            client_key: '/certs/key.pem',
+                            read_timeout: 300).
                        and_return(double(status: 204))
       api.stop_container('12345', 300)
     end
@@ -187,7 +188,8 @@ describe Centurion::DockerViaApi do
       expect(Excon).to receive(:post).
                        with(excon_uri + "v1.12" + "/containers/12345/stop?t=30",
                             client_cert: '/certs/cert.pem',
-                            client_key: '/certs/key.pem').
+                            client_key: '/certs/key.pem',
+                            read_timeout: 30).
                        and_return(double(status: 204))
       api.stop_container('12345')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: centurion
 version: !ruby/object:Gem::Version
-  version: 1.8.7
+  version: 1.8.8
 platform: ruby
 authors:
 - Nic Benders
@@ -20,118 +20,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.33'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.33'
 - !ruby/object:Gem::Dependency
   name: logger-colors
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -155,8 +155,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CONTRIBUTORS.md
 - Gemfile
 - LICENSE
@@ -208,17 +208,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: A deployment tool for Docker. Takes containers from a Docker registry and