centurion 1.8.4 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 369271bc0ce536e622fa0f0af79033e644fabd73
-  data.tar.gz: 0a6212a1a65e3c2d5d24dfdc5aee9d41c4144993
+  metadata.gz: 54fb3e35e5c7be90b4d79745d899b8434157977f
+  data.tar.gz: 13355844e36026541dd2d31a4d9ed2ac3c099dd7
 SHA512:
-  metadata.gz: 1b48a1ff8e0da6f5a2b942ba7a5dbbbd377200c2c0f45c7d763fc99cfa2936a1c3c135f5b6bff84feabe10f813e8e7d18f3e23c1e50b674e96733ea7c1f3aa66
-  data.tar.gz: 80a0fdae74711b67cd80cb732a0bf14bfefb56c69bafa0302b07a8b6449dc96873b2552cfc11fbf6a7db4590d0e272fe894ae6eefdffd5f7ccd694b3b697981b
+  metadata.gz: de4a567728bf795ca5f9dff906b3a6ccf97607689a0bf1a1ccba31a30d0a8ecc3e825b2efa3118645087773896f0b9c592a2f8126e303e88c08082804482815d
+  data.tar.gz: 0c9c70fe003c2eac325bc9b130371425e1e67429a2a45a6a43aee78828dcb218fd3f5dde3a785714d47e3b706e34c69f884e6f492de208915b75a4e3f0a841d6

data/.travis.yml

@@ -0,0 +1 @@
+language: ruby

data/CONTRIBUTORS.md

@@ -13,6 +13,7 @@ Your name could be here!
  * [Jon Wood][jellybob]
  * [Mark Borcherding][markborcherding]
  * [Nick Laferriere][laferrieren]
+ * [Hugo Chinchilla][hugochinchilla]
 
 Pre-release
 -----------
@@ -74,3 +75,5 @@ Contributor                                   | Commits    | Additions | Deletio
 [skarap]: https://github.com/skarap
 [jellybob]: https://github.com/jellybob
 [markborcherding]: https://github.com/markborcherding
+[dselans]: https://github.com/dselans
+[idleyoungman]: https://github.com/idleyoungman

data/README.md

@@ -394,6 +394,14 @@ with `/bin/bash`. It will use the first host from the host list.
 ````bash
 $ bundle exec centurion -p radio-radio -e staging -a deploy_console
 ````
+### Repair unhealthy docker containers
+
+This will preform a health check on each host using rolling deployment
+health check settings and redeploy to the host if a health check fails.
+
+````bash
+$ bundle exec centurion -p radio-radio -e staging -a repair
+````
 
 ###List all the tags running on your servers for a particular project
 

data/lib/centurion/deploy.rb

@@ -23,9 +23,11 @@ module Centurion::Deploy
 
   def wait_for_health_check_ok(health_check_method, target_server, container_id, port, endpoint, image_id, tag, sleep_time=5, retries=12)
     info 'Waiting for the port to come up'
+    healthy = false
     1.upto(retries) do
       if container_up?(target_server, container_id) && health_check_method.call(target_server, port, endpoint)
         info 'Container is up!'
+        healthy = true
         break
       end
 
@@ -33,7 +35,7 @@ module Centurion::Deploy
       sleep(sleep_time)
     end
 
-    unless health_check_method.call(target_server, port, endpoint)
+    unless healthy
       error "Failed to validate started container on #{target_server.hostname}:#{port}"
       exit(FAILED_CONTAINER_VALIDATION)
     end
@@ -97,7 +99,7 @@ module Centurion::Deploy
 
   def start_new_container(server, service, restart_policy)
     container_config = service.build_config(server.hostname, &hostname_proc)
-    info "Creating new container for #{container_config['Image'][0..7]}"
+    info "Creating new container for #{container_config['Image']}"
     container = server.create_container(container_config, service.name)
 
     host_config = service.build_host_config(restart_policy)
@@ -126,4 +128,14 @@ module Centurion::Deploy
 
     server.attach(container['Id'])
   end
+
+  def enter_container(server, service)
+    container = if service.public_ports.nil? || service.public_ports.empty?
+      server.find_containers_by_name(service.name).first
+    else
+      server.find_containers_by_public_port(service.public_ports.first).first
+    end
+
+    server.exec_it(container["Id"], "/bin/bash")
+  end
 end

data/lib/centurion/deploy_dsl.rb

@@ -8,6 +8,10 @@ module Centurion::DeployDSL
     build_server_group.tap { |hosts| hosts.each { |host| block.call(host) } }
   end
 
+  def on_first_docker_host(&block)
+    build_server_group.tap { |hosts| block.call(hosts.first) }
+  end
+
   def env_vars(new_vars)
     current = fetch(:env_vars, {})
     new_vars.each_pair do |new_key, new_value|

data/lib/centurion/docker_server.rb

@@ -16,7 +16,7 @@ class Centurion::DockerServer
   def_delegators :docker_via_api, :create_container, :inspect_container,
                  :inspect_image, :ps, :start_container, :stop_container,
                  :remove_container, :restart_container
-  def_delegators :docker_via_cli, :pull, :tail, :attach, :exec
+  def_delegators :docker_via_cli, :pull, :tail, :attach, :exec, :exec_it
 
   def initialize(host, docker_path, tls_params = {})
     @docker_path = docker_path

data/lib/centurion/docker_via_cli.rb

@@ -31,6 +31,14 @@ class Centurion::DockerViaCli
     Centurion::Shell.echo(build_command(:exec, "#{container_id} #{commandline}"))
   end
 
+  def exec_it(container_id, commandline)
+    # the "or true" on the command is to prevent an exception from Shell.validate_status
+    # because docker exec returns the same exit code as the latest command executed on
+    # the shell, which causes an exception to be raised if the latest comand executed
+    # was unsuccessful when you exit the shell.
+    Centurion::Shell.echo(build_command(:exec, "-it #{container_id} #{commandline} || true"))
+  end
+
   private
 
   def self.tls_keys

data/lib/centurion/service.rb

@@ -34,6 +34,8 @@ module Centurion
         s.port_bindings = fetch(:port_bindings, [])
         s.network_mode  = fetch(:network_mode, 'bridge')
         s.command       = fetch(:command, nil)
+        s.memory        = fetch(:memory, 0)
+        s.cpu_shares    = fetch(:cpu_shares, 0)
 
         s.add_env_vars(fetch(:env_vars, {}))
       end
@@ -141,6 +143,12 @@ module Centurion
       # Add ExtraHosts if needed
       host_config['ExtraHosts'] = extra_hosts if extra_hosts
 
+      # Set memory limits
+      host_config['Memory'] = memory if memory
+
+      # Set cpushare limits
+      host_config['CpuShares'] = cpu_shares if cpu_shares
+
       # Restart Policy
       if restart_policy
         host_config['RestartPolicy'] = {}

data/lib/centurion/version.rb

@@ -1,3 +1,3 @@
 module Centurion
-  VERSION = '1.8.4'
+  VERSION = '1.8.5'
 end

data/lib/tasks/deploy.rake

@@ -12,7 +12,7 @@ end
 
 task :deploy_console do
   invoke 'deploy:get_image'
-  invoke 'deploy:stop'
+  #invoke 'deploy:stop'
   invoke 'deploy:launch_console'
   invoke 'deploy:cleanup'
 end
@@ -23,7 +23,14 @@ task :rolling_deploy do
   invoke 'deploy:cleanup'
 end
 
+task :repair do
+  invoke 'deploy:get_image'
+  invoke 'deploy:repair'
+  invoke 'deploy:cleanup'
+end
+
 task :stop => ['deploy:stop']
+task :enter_container => ['deploy:enter_container']
 
 namespace :dev do
   task :export_only do
@@ -106,11 +113,18 @@ namespace :deploy do
   end
 
   task :launch_console do
-    on_each_docker_host do |server|
+    on_first_docker_host do |server|
+      defined_service.port_bindings.clear
       launch_console(server, defined_service)
     end
   end
 
+  task :enter_container do
+    on_first_docker_host do |server|
+      enter_container(server, defined_service)
+    end
+  end
+
   task :rolling_deploy do
     on_each_docker_host do |server|
       service = defined_service
@@ -138,6 +152,27 @@ namespace :deploy do
     end
   end
 
+  task :repair do
+    service = defined_service
+
+    # find nodes that are down
+    on_each_docker_host do |server|
+      failed_healthcheck = false
+      public_ports = service.public_ports - fetch(:rolling_deploy_skip_ports, [])
+      public_ports.each do |port|
+        unless method(:http_status_ok?).call(server, port, fetch(:status_endpoint, '/'))
+          failed_healthcheck = true 
+          break
+        end
+      end
+      next unless failed_healthcheck
+      # issue stop to clean host
+      stop_containers(server, service, fetch(:stop_timeout, 30))
+      # start new container services is already down, so no need to role gracefully
+      start_new_container(server, defined_service, defined_restart_policy)
+    end
+  end
+
   task :cleanup do
     on_each_docker_host do |server|
       cleanup_containers(server, defined_service)

data/spec/deploy_dsl_spec.rb

@@ -124,6 +124,16 @@ describe Centurion::DeployDSL do
       expect(DeployDSLTest.defined_service.network_mode).to eq('host')
     end
 
+    it 'accepts cpu share limit' do
+      DeployDSLTest.cpu_shares(12345678)
+      expect(DeployDSLTest.defined_service.cpu_shares).to eq(12345678)
+    end
+
+    it 'accepts memory limit' do
+      DeployDSLTest.memory(12345)
+      expect(DeployDSLTest.defined_service.memory).to eq(12345)
+    end
+
     it 'accepts bridge mode' do
       DeployDSLTest.network_mode('bridge')
       expect(DeployDSLTest.defined_service.network_mode).to eq('bridge')

data/spec/dogestry_spec.rb

@@ -55,15 +55,6 @@ describe Centurion::Dogestry do
     end
   end
 
- describe '#pull' do
-   it 'returns correct value' do
-    if registry.which('dogestry')
-      expect(registry).to receive(:echo).with("dogestry #{flags} pull #{registry.s3_url} #{repo}")
-      registry.pull(repo, pull_hosts)
-    end
-   end
- end
-
   describe '#which' do
     it 'finds dogestry command line' do
       allow(File).to receive(:executable?).and_return(true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: centurion
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.5
 platform: ruby
 authors:
 - Nic Benders
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -156,6 +156,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CONTRIBUTORS.md
 - Gemfile
 - LICENSE