capistrano-docker_cluster 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebbb1defa7363b3977d59a8086513972c4a0258a4e3766b4de6c306f5beee4ed
-  data.tar.gz: 49e0318d6ef793cbe74351bfcce166e456aabd28347c430917b44bd836fca518
+  metadata.gz: ec723926c7aa3eff8fd1881623c844c3dc9227861233a0d06165aa6e67027e00
+  data.tar.gz: 071c150e5e27d974f8382d37468dad6ef13161ee23bb848512ca3d582213776d
 SHA512:
-  metadata.gz: 44497d8dd8ab30ac78b15362e7ecf8e5081a238804034273e183d5811a6ba4e5189a93f9db486672bd1708ce7b325ad6ec5e1894bddda4d5e6d6b6a117789e43
-  data.tar.gz: 7cdd4315f6a9cface2ee10216f7e7376a9d1dbbd21efd20b6a6b104b21c72ca4635e3bd0829bdf77e3f1dae6dc9117b5bb340f75d4e7f14e4755032e9dd3f8f0
+  metadata.gz: 186ffdb3cd72c0f0710fb99b329bf6cf003df5e75c25d2f1c9a97f062df10c9cbe5c937b499a934c18b65200b96d58d000a84d676f72886e6312061c78388c75
+  data.tar.gz: e9b5246df144de6550eab34bc11df997cda612af7e375b7fa7808b14a2378da160885f7dfb2b9ddb908658b679a6d3660225e10ccb6ba3d75f32b486527ff747

data/CHANGE_LOG.md

@@ -1,3 +1,9 @@
+# 1.0.6
+
+* Store docker image url in release directory.
+* Add support to pull the docker image on rollback.
+* Use docker tags in scripts instead of image ids.
+
 # 1.0.5
 
 * Add "--no-" prefix on arguments to remove them.

data/lib/capistrano/docker_cluster/scripts.rb

@@ -15,7 +15,7 @@ module Capistrano
       def start_script(host)
         apps = Array(fetch_for_host(host, :docker_apps))
         cmd = "exec bin/docker-cluster"
-        image_id = fetch(:docker_image_id)
+        image_id = "#{fetch(:docker_repository)}:#{fetch(:docker_tag)}"
         prefix = fetch(:docker_prefix)
 
         cases = []
@@ -28,7 +28,7 @@ module Capistrano
           #!/usr/bin/env bash
 
           # Generated: #{Time.now.utc.iso8601}
-          # Docker image tag: #{fetch(:docker_repository)}/#{fetch(:docker_tag)}
+          # Docker image tag: #{fetch(:docker_repository)}:#{fetch(:docker_tag)}
 
           set -o errexit
 
@@ -59,7 +59,7 @@ module Capistrano
         apps = apps.collect(&:to_s).uniq
 
         cmd = "exec bin/docker-cluster"
-        image_id = fetch(:docker_image_id)
+        image_id = "#{fetch(:docker_repository)}:#{fetch(:docker_tag)}"
 
         cases = []
         apps.each do |app|
@@ -71,7 +71,7 @@ module Capistrano
           #!/usr/bin/env bash
 
           # Generated: #{Time.now.utc.iso8601}
-          # Docker image tag: #{fetch(:docker_repository)}/#{fetch(:docker_tag)}
+          # Docker image tag: #{fetch(:docker_repository)}:#{fetch(:docker_tag)}
 
           set -o errexit
 
@@ -104,7 +104,7 @@ module Capistrano
           #!/usr/bin/env bash
 
           # Generated: #{Time.now.utc.iso8601}
-          # Docker image tag: #{fetch(:docker_repository)}/#{fetch(:docker_tag)}
+          # Docker image tag: #{fetch(:docker_repository)}:#{fetch(:docker_tag)}
 
           set -o errexit
 

data/lib/capistrano/docker_cluster/version.rb

@@ -2,6 +2,6 @@
 
 module Capistrano
   module DockerCluster
-    VERSION = "1.0.5"
+    VERSION = "1.0.6"
   end
 end

data/lib/capistrano/tasks/docker_cluster.rake

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "shellwords"
+
 set :docker_roles, [:docker]
 
 def as_docker_user
@@ -17,9 +19,14 @@ end
 
 namespace :deploy do
   after :new_release_path, "docker:create_release"
+
   after :updating, "docker:update"
+
   after :published, "docker:restart"
 
+  after :reverted, "docker:revert_image"
+
+  # Required to be defined
   task :upload do
   end
 end
@@ -32,17 +39,7 @@ namespace :docker do
     end
 
     if fetch(:docker_repository).include?("/")
-       invoke "docker:pull"
-    end
-  end
-
-  task :set_image_id => :build do
-    on release_roles(fetch(:docker_roles)).first do
-      docker_tag_url =  "#{fetch(:docker_repository)}:#{fetch(:docker_tag)}"
-      as_docker_user do
-        image_id = capture(:docker, "image", "ls", "--no-trunc", "--format", "'{{.ID}}'", docker_tag_url)
-        set :docker_image_id, image_id[7, 12]
-      end
+      invoke "docker:pull"
     end
   end
 
@@ -51,12 +48,13 @@ namespace :docker do
   end
 
   desc "Update the configuration and command line arguments for running a docker deployment."
-  task :update => :set_image_id do
+  task :update do
     invoke("docker:copy_configs")
     invoke("docker:upload_commands")
+    invoke("docker:remove_revision")
   end
 
-  desc "Prune the docker engine of all dangling images, containers, and volumes."
+  desc "Prune the docker engine of all dangling images, containers, and networks."
   task :prune do
     on release_roles(fetch(:docker_roles)) do |host|
       as_docker_user do
@@ -65,15 +63,51 @@ namespace :docker do
     end
   end
 
-  desc "Pull a tag from a remote into the local docker engine. If the task docker:authenticate is defined, it will be invoked first."
-  task :pull do
-    docker_tag_url =  "#{fetch(:docker_repository)}:#{fetch(:docker_tag)}"
-    if Rake::Task.task_defined?('docker:authenticate')
-      invoke "docker:authenticate"
+  desc "Pull the tagged docker image from a remote repository into the local docker engine."
+  task :pull => :authenticate do
+    docker_image_url =  "#{fetch(:docker_repository)}:#{fetch(:docker_tag)}"
+    on release_roles(fetch(:docker_roles)) do |host|
+      within(release_path) do
+        as_docker_user do
+          docker_info = capture(:docker, "pull", docker_image_url)
+          digest = docker_info.match(/Digest: (sha256:[0-9a-f]+)/)
+          if digest
+            execute :echo, "'#{fetch(:docker_repository)}@#{digest[1]}' > DOCKER_IMAGE_URL"
+          end
+        end
+      end
+    end
+  end
+
+  desc "Pull the pinned docker image from the current release and tag it."
+  task :revert_image => :authenticate do
+    on release_roles(fetch(:docker_roles)) do |host|
+      within "#{fetch(:deploy_to)}/current" do
+        as_docker_user do
+          docker_image_url = capture(:cat, "DOCKER_IMAGE_URL")
+          if docker_image_url.include?("/")
+            execute :docker, "pull", docker_image_url
+          end
+          execute :docker, "tag", docker_image_url, "#{fetch(:docker_repository)}:#{fetch(:docker_tag)}"
+        end
+      end
     end
+  end
+
+  desc "You must implement the docker:authenticate task if your respository requires credentials."
+  task :authenticate do
+  end
+
+  desc "Remove the revision file if it contains placeholder text"
+  task :remove_revision do
     on release_roles(fetch(:docker_roles)) do |host|
-      as_docker_user do
-        execute :docker, "pull", docker_tag_url
+      within(release_path) do
+        if test("[ -f #{Shellwords.escape(release_path)}/REVISION ]")
+          revision = capture(:cat, "REVISION")
+          if revision.include?(" ")
+            execute :rm, "REVISION"
+          end
+        end
       end
     end
   end
@@ -130,13 +164,11 @@ namespace :docker do
   desc "Copy configuration files used to start the docker containers."
   task :copy_configs do
     on release_roles(fetch(:docker_roles)) do |host|
-      configs = Capistrano::DockerCluster::Scripts.new(self).docker_config_map(host)
-      unless configs.empty?
-        within fetch(:release_path) do
-          execute(:mkdir, "-p", "config")
-          configs.each do |name, local_path|
-            upload! local_path, "config/#{name}"
-          end
+      within fetch(:release_path) do
+        configs = Capistrano::DockerCluster::Scripts.new(self).docker_config_map(host)
+        execute(:mkdir, "-p", "config")
+        configs.each do |name, local_path|
+          upload! local_path, "config/#{name}"
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-docker_cluster
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Brian Durand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano