shiplane_deployers_capistrano_docker 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 364e58192cbe9634554f60ebc8de29ea1e735860cf8a9ccb75f9e39dbed28141
-  data.tar.gz: ab0c613ffc3941a69abdb3cf9d7281f09bedb240fb9946dc8fb4926af9da750e
+  metadata.gz: e780fd8753c445c93d3e8312bece22f694b4a7f82ee0b51692e0f40b8635300e
+  data.tar.gz: 2395dabe4c5a062bc2d2564535d4e1b83cef242b865775c668bb32bab025a2f9
 SHA512:
-  metadata.gz: 5b232cdb32786618f1d77b5c2fae9bd778224cb7a2e19f286bd91d43e8ac7997709dc23728a4b236d2500bdb57ada5f08f8b12155847c992231786ecc22ee2f3
-  data.tar.gz: 8c5656831c42e46014a0dab0765929b50b02d4c0ad5def33233b0cfa77f78d5b79d8cbfa333466aa6444971294bb0e3c588a34c6e7e2e354611cce8f95070d79
+  metadata.gz: abd83520b1624c3a3b7e0ded6c78ddb40798ab05f92225571beab2622dab9a0892ee8deb0c288e64997ed5effff0c7b8d6cfeee26ef8b9df6811da3198c8dd4b
+  data.tar.gz: 6105ad73c96323c16e2b166f1ac5587b43e256ef73740bb0d211c207ea44030f4b8d026875d009371594b1718691899c967511b6489b3ae344e5ba4e7585bbf5

data/lib/capistrano/shiplane_deployers_capistrano_docker.rb

@@ -1,2 +1,2 @@
-load File.expand_path('../tasks/dockerhub.rake', __FILE__)
+load File.expand_path('../tasks/docker_repo.rake', __FILE__)
 load File.expand_path('../tasks/deployer.rake', __FILE__)

data/lib/capistrano/tasks/{dockerhub.rake → docker_repo.rake}

@@ -1,18 +1,28 @@
 namespace :shiplane do
-  task :login_to_dockerhub do
+  task :login_to_container_service do
     fetch(:shiplane_container_configurations).each do |name, config|
       roles = roles(config.fetch(:capistrano_role, :all)).map{|role| Shiplane::Host.new(role, env) }
       roles.each do |role|
         on role.capistrano_role do
-          username = fetch(:shiplane_docker_registry_username)
-          password = fetch(:shiplane_docker_registry_password)
-          execute "echo '#{password}' | #{config.docker_command(role)} login --username #{username} --password-stdin"
+          command = [
+            'echo',
+            fetch(:shiplane_docker_registry_token),
+            '|',
+            config.docker_command(role),
+            'login',
+            fetch(:shiplane_docker_registry_url, nil),
+            '--username',
+            fetch(:shiplane_docker_registry_username),
+            '--password-stdin',
+          ].compact.join(' ')
+          
+          execute command
         end
       end
     end
   end
 
-  task download_container: [:login_to_dockerhub] do
+  task download_container: [:login_to_container_service] do
     fetch(:shiplane_container_configurations).each do |name, config|
       roles = roles(config.fetch(:capistrano_role, :all)).map{|role| Shiplane::Host.new(role, env) }
       roles.each do |role|

data/lib/shiplane/deployers/capistrano_docker/version.rb

@@ -3,7 +3,7 @@
 module Shiplane
   module Deployers
     module CapistranoDocker
-      VERSION = "0.1.17"
+      VERSION = "0.1.18"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shiplane_deployers_capistrano_docker
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - John Epperson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -102,7 +102,7 @@ files:
 - lib/capistrano/shiplane_deployers_capistrano_docker.rb
 - lib/capistrano/shiplane_deployers_capistrano_docker/version.rb
 - lib/capistrano/tasks/deployer.rake
-- lib/capistrano/tasks/dockerhub.rake
+- lib/capistrano/tasks/docker_repo.rake
 - lib/shiplane/deployers/capistrano_docker/version.rb
 homepage: https://github.com/kirillian/shiplane
 licenses: