rory-deploy 1.8.4.2 → 1.8.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28c70019cc82629eac23f476f8d6598eceab7316
-  data.tar.gz: b9f80eea07cbbc7a9d0f7b9f83fdc0d2f7b954a2
+  metadata.gz: 2ae900af42a7bac7015b1afe468e9a4592f85766
+  data.tar.gz: e2a9c1e2e1397bc1a20b86854f0166f7070c4421
 SHA512:
-  metadata.gz: f2f4a7dd87cadb63a8f9e4274526b752b7ef8a652ad3c83ba83ab5fdb8f481c2669107d468b29015e2e19b02882725694fb710fefa3e0bbcd0f4415993f74645
-  data.tar.gz: 5585737548049cbb225c36c96b639dc0497b0e1dbf9d21c996a8c3caaf08ca4de81776204c162471ab888ad89395aeb21acf2cc8811956b400592fe5e4dea3d7
+  metadata.gz: d6926cecb3da929ee042dbf3d0e70aacb440f34207b5ddda4ebfaccccc62a11ba27d994eaf6944d489e1b76a04d2322b866765171c0a78f6c026c3900a4530b7
+  data.tar.gz: f6e6a5e4e7be674597b91c9360eb3e4dd4a75c40828df237d3b17a4637c2ca73c682e6ba0fe07b44c0e3bb6173518558066b9b3cd9829894168f1392e2a04fb2

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
 -----------

data/lib/centurion/deploy.rb

@@ -126,4 +126,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/version.rb

@@ -1,3 +1,3 @@
 module Centurion
-  VERSION = '1.8.4.2'
+  VERSION = '1.8.4.3'
 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
@@ -24,6 +24,7 @@ task :rolling_deploy do
 end
 
 task :stop => ['deploy:stop']
+task :enter_container => ['deploy:enter_container']
 
 namespace :dev do
   task :export_only do
@@ -106,11 +107,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rory-deploy
 version: !ruby/object:Gem::Version
-  version: 1.8.4.2
+  version: 1.8.4.3
 platform: ruby
 authors:
 - Hugo Chinchilla