capistrano-dockerbuild 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c76b5158e48a01111cf0484a73d6a29bb0a5fbf739e6436fc07953597368f4a
-  data.tar.gz: 8d3f8902a8b6c0d236d2b3b2ecf6739ed47eaed40e82419f229bc0dd3215aaac
+  metadata.gz: 1478c1f08638b7fbd90429775a474e501920403a455dc222b43bb7c031d2c873
+  data.tar.gz: 6d77122f43ed9fe79f9c672f4b2d209056c44396a4767efa24f0bd7886a94b45
 SHA512:
-  metadata.gz: b1bc3546464847bfcacff5899ea1a06764eccec638a28e897958b270fb8d4dce3020743fc3f59f5085bc765501b1d5a4514f28b668429a1eee3490720ce819df
-  data.tar.gz: 545b691af1175f8775765cd478e5f0100aa472e5b4235a57de9c5c7018365fbb584b0d2b347f2ec6a7cfc432e4b0394afb4d33ebfae4e295760253e55c86375c
+  metadata.gz: db2802cde724287f42aadc207c9f195d6a14b9475196c49d3f8a476a6ef61babdf23b3013a1a5d18dfee0c3703beb7b8ace4d989c1af8bf977f4f178b4ed0fe4
+  data.tar.gz: 759048b911f58047325cd50aae2f84937cee18834b78cb8596a4e185d88e0e8a241eb3c82019cec2e18b64bbc6942d179564bd8514af987bf59d5e7425476560

data/README.md

@@ -50,7 +50,24 @@ Use common variables
 | docker_remote_tag             | no       | `-> { fetch(:docker_tag) }`                                                                                        | Use by `docker push docker_registry/docker_remote_repository_name:{{docker_remote_tag}}` |
 | docker_remote_tag_full        | no       | `-> { "#{fetch(:docker_registry) &.+ "/"}#{fetch(:docker_remote_repository_name)}:#{fetch(:docker_remote_tag)}" }` | Use by `docker push {{docker_remote_tag_full}}`                                          |
 | keep_docker_image_count       | no       | 10                                                                                                                 |                                                                                          |
+| git_http_username             | no       | nil                                                                                                                | See below                                                                                |
+| git_http_password             | no       | nil                                                                                                                | See below                                                                                |
 
+If you want to use GitHub Apps installation access token or something to authorize repository access using HTTPS protocol. You can set variables in your config/deploy.rb:
+
+```ruby
+set :git_http_username, -> { ENV["GIT_HTTP_USERNAME"] }
+set :git_http_password, -> { ENV["GIT_HTTP_PASSWORD"] }
+set :repo_url, -> do
+  if fetch(:git_http_username) && fetch(:git_http_password)
+    "https://github.com/owner/repo.git"
+  else
+    "git@github.com:owner/repo.git"
+  end
+end
+```
+
+Update remote URL always if you set proper value to all of `repo_url`, `git_http_username`, and `git_http_password`.
 
 ## Tasks
 

data/capistrano-dockerbuild.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "capistrano-dockerbuild"
-  spec.version       = "0.2.0"
+  spec.version       = "0.2.2"
   spec.authors       = ["joker1007"]
   spec.email         = ["kakyoin.hierophant@gmail.com"]
 

data/lib/capistrano/dockerbuild.rb

@@ -1,3 +1,6 @@
+require "cgi"
+require "uri"
+
 class Capistrano::Dockerbuild < Capistrano::Plugin
   def set_defaults
     set_if_empty :docker_build_cmd, -> { [:docker, "build", "-t", fetch(:docker_tag_full), "."] }
@@ -21,4 +24,19 @@ class Capistrano::Dockerbuild < Capistrano::Plugin
     raise "Need to set :docker_build_base_dir" unless fetch(:docker_build_base_dir)
     Pathname(fetch(:docker_build_base_dir))
   end
+
+  def git_repo_url
+    if fetch(:git_http_username) && fetch(:git_http_password)
+      URI.parse(repo_url).tap do |repo_uri|
+        repo_uri.user     = fetch(:git_http_username)
+        repo_uri.password = CGI.escape(fetch(:git_http_password))
+      end.to_s
+    elsif fetch(:git_http_username)
+      URI.parse(repo_url).tap do |repo_uri|
+        repo_uri.user = fetch(:git_http_username)
+      end.to_s
+    else
+      repo_url
+    end
+  end
 end

data/lib/capistrano/tasks/docker.rake

@@ -5,7 +5,7 @@ namespace :docker do
   task :check do
     on fetch(:docker_build_server_host) do
       execute :mkdir, "-p", dockerbuild_plugin.docker_build_base_path.dirname.to_s
-      execute :git, :'ls-remote', repo_url, "HEAD"
+      execute :git, :'ls-remote', dockerbuild_plugin.git_repo_url, "HEAD"
     end
   end
 
@@ -17,7 +17,7 @@ namespace :docker do
           info "The repository is at #{dockerbuild_plugin.docker_build_base_path}"
         else
           within dockerbuild_plugin.docker_build_base_path.dirname do
-            execute :git, :clone, repo_url, dockerbuild_plugin.docker_build_base_path.to_s
+            execute :git, :clone, dockerbuild_plugin.git_repo_url, dockerbuild_plugin.docker_build_base_path.to_s
           end
         end
       else
@@ -25,7 +25,7 @@ namespace :docker do
           info t(:mirror_exists, at: dockerbuild_plugin.docker_build_base_path.to_s)
         else
           within dockerbuild_plugin.docker_build_base_path.dirname do
-            execute :git, :clone, "--mirror", repo_url, dockerbuild_plugin.docker_build_base_path.to_s
+            execute :git, :clone, "--mirror", dockerbuild_plugin.git_repo_url, dockerbuild_plugin.docker_build_base_path.to_s
           end
         end
       end
@@ -36,6 +36,7 @@ namespace :docker do
   task update_mirror: :'docker:clone' do
     on fetch(:docker_build_server_host) do
       within dockerbuild_plugin.docker_build_base_path do
+        execute :git, :remote, "set-url", :origin, dockerbuild_plugin.git_repo_url
         execute :git, :remote, :update, "--prune"
       end
     end
@@ -82,6 +83,14 @@ namespace :docker do
     end
   end
 
+  task :push_unless_exists => [:'docker:build'] do
+    on fetch(:docker_build_server_host) do
+      unless test "docker manifest inspect #{fetch(:docker_remote_tag_full)}"
+        invoke "docker:push"
+      end
+    end
+  end
+
   task :cleanup_local_images do
     on fetch(:docker_build_server_host) do
       local_images = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-dockerbuild
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - joker1007
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-15 00:00:00.000000000 Z
+date: 2024-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Capistrano task definition for `docker build`