retag 0.1.11.286383 → 0.2.2.290087

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d879ab6878ea43b9ab3e49c7fee232db8703f42cb4a21dc730a58927c0b62da3
-  data.tar.gz: 9bec5fb8de75b0572360f99680807f92e075cea57081e616bb3f7efd3680a3da
+  metadata.gz: d08628d204433079ea7b5345a7ee74e0fcc9e2b9b06110383fc9002a238c392a
+  data.tar.gz: 1a7e52183548f21bbb8019c07e5e0f13c98c56305d9ebe26a06218122a292566
 SHA512:
-  metadata.gz: 41e0d9719de539cca968231ab970239bdedd23689420f1e510b5f04f91d562a1ec8fd2d647ed1ae5c79583a1a026a81f7898ff51314181d4facaf38a1feae9e9
-  data.tar.gz: 25178057a198077b9ad11e03cfa38e79b94a59a23b0e6373cf18cdcab9f6160a717edca0b4741f3f350c28b4c23566362351a24336cdeb8b4781993213f0bbe9
+  metadata.gz: 437fa7228f9cbeb0c1bb301471b81093fb90394874b4ac11849c4d5bf36e02c5866064cc5be10e9ea246171e74ca7e7ae24ace3f6f0ecd6a7b0ba0be7ce40764
+  data.tar.gz: 7105927440b35adfe9014b4517fcce922f895df5e98aa8453fc83f83daac5e417d811a81514e645375a785d8c05d32879ea458bf9a68cae900490e1a48468a1c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    retag (0.1.11)
+    retag (0.2.2)
       activesupport (~> 6.0)
       colorize (~> 0.8.1)
       gitlab (< 5.0)
@@ -47,7 +47,7 @@ GEM
       concurrent-ruby (~> 1.0)
     json (2.9.1)
     language_server-protocol (3.17.0.4)
-    logger (1.6.5)
+    logger (1.6.6)
     mini_mime (1.1.5)
     minitest (5.25.4)
     multi_xml (0.6.0)

data/bin/retag

@@ -80,6 +80,14 @@ class DockerCommand < Thor
                   required: true,
                   desc:     "Env: #{ENV_PREFIX}_TAG_TAG. New tag"
 
+  option :project, default:  ENV.fetch("#{ENV_PREFIX}_TAG_PROJECT", nil),
+                  required: false,
+                  desc:     "Env: #{ENV_PREFIX}_TAG_PROJECT. Change repository project"
+
+  option :api,    default:  ENV.fetch("#{ENV_PREFIX}_TAG_API", 'harbor'),
+                  required: false,
+                  desc:     "Env: #{ENV_PREFIX}_TAG_API. Which API user for: [harbor]"
+
   option :suffix, default:  ENV.fetch("#{ENV_PREFIX}_TAG_SUFFIX", nil),
                   required: false,
                   desc:     "Env: #{ENV_PREFIX}_TAG_SUFFIX. Optional suffix added to image tag: <image>:<tag>[-<suffix>].
@@ -96,11 +104,11 @@ class DockerCommand < Thor
     tag ||= 'latest'
     tag = opts['suffix'].present? ? "#{tag}-#{opts['suffix']}" : tag
 
-    image = ::Retag::Image.new(img, tag)
+    image = ::Retag::Image.new(img, tag, api: opts['api'])
 
     $logger.info ">>> Image #{image.image}"
     $logger.info "  From ".ljust(5) + "[#{image.tag.colorize(:yellow)}]: ".ljust(35) + image.full
-    newimg = image.retag!(opts['tag'])
+    newimg = image.retag!(opts['tag'], newproject: opts['project'])
     $logger.info "  To ".ljust(5) + "[#{newimg.tag.colorize(:yellow)}]: ".ljust(35) + newimg.full
   end
 
@@ -116,6 +124,14 @@ class ReleaseCommand < Thor
                   required: true,
                   desc:     "Env: #{ENV_PREFIX}_RELEASE_CONFIG. Path to release manifest"
 
+  option :project, default:  ENV.fetch("#{ENV_PREFIX}_RELEASE_PROJECT", nil),
+                  required: false,
+                  desc:     "Env: #{ENV_PREFIX}_TAG_PROJECT. Change Docker repository project"
+
+  option :api,    default:  ENV.fetch("#{ENV_PREFIX}_RELEASE_API", 'harbor'),
+                  required: false,
+                  desc:     "Env: #{ENV_PREFIX}_TAG_API. Which API user for: [harbor]"
+
   option :name,   default:  ENV.fetch("#{ENV_PREFIX}_RELEASE_NAME", nil),
                   required: false,
                   desc:     "Env: #{ENV_PREFIX}_RELEASE_NAME. Name of the current release"
@@ -137,7 +153,7 @@ class ReleaseCommand < Thor
     branch = config['default-branch']
 
     services = config['services'].map do|(name, cfg)|
-      Retag::Service.new(name, cfg, release, suffix: cfg.fetch('suffix', suffix), branch: cfg.fetch('branch', branch)) unless name.start_with?('.')
+      Retag::Service.new(name, cfg, release, suffix: cfg.fetch('suffix', suffix), branch: cfg.fetch('branch', branch), api: opts['api']) unless name.start_with?('.')
     end.compact
 
     tag_message = "Release #{release} at #{DateTime.now.iso8601}"
@@ -155,7 +171,7 @@ class ReleaseCommand < Thor
 
             $logger.shift do
               $logger.info "From ".ljust(5) + "[#{img.tag.colorize(:yellow)}]: ".ljust(35) + img.full
-              newimg = img.retag!(release)
+              newimg = img.retag!(release, newproject: opts['project'])
               $logger.info "To ".ljust(5) + "[#{newimg.tag.colorize(:yellow)}]: ".ljust(35) + newimg.full
 
               markdown += "* **Name**: `#{srv.name}`<br>**Version**: #{img.tag}<br>**Image**: #{newimg.full}\n"

data/lib/retag/image.rb

@@ -5,20 +5,24 @@ module Retag
   class Image
 
     include Utils
-    attr_reader :full, :image, :tag
+    attr_reader :full, :image, :tag, :api
 
-    def initialize(image, tag, suffix: nil)
+    def initialize(image, tag, suffix: nil, api: nil)
       @image = image
       @tag = tag
       @tag = "#{@tag}-#{suffix}" if suffix.present?
       @full = "#{@image}:#{@tag}"
+      @api = api
     end
 
-    def retag!(newtag = tag)
+    def retag!(newtag = tag, newproject: nil)
       uri = ::URI.parse("https://#{image}")
       repo = uri.path
       repo[0..0] = ''
+      project, *center, registry = repo.split('/')
       uri.path = ''
+      newrepo = repo
+      newrepo = repo.sub("#{project}/", "#{newproject}/") if newproject
 
       content_type = 'application/vnd.docker.distribution.manifest.v2+json'
 
@@ -28,11 +32,26 @@ module Retag
 
         file.write(manifest.to_json)
         file.flush
-        result = cmd!("curl -s -u '#{dockerauth(uri.host)}' -H 'Content-Type: #{content_type}' -H 'Accept: #{content_type}' -X PUT --data-binary @#{file.path} '#{uri}/v2/#{repo}/manifests/#{newtag}' -o -", capture: true).strip
+
+        if newtag.to_s.strip != tag.to_s.strip
+          result = cmd!("curl -s -u '#{dockerauth(uri.host)}' -H 'Content-Type: #{content_type}' -H 'Accept: #{content_type}' -X PUT --data-binary @#{file.path} '#{uri}/v2/#{repo}/manifests/#{newtag}' -o -", capture: true).strip
+          raise result unless result.empty?
+        end
+
+        if newrepo != repo
+          if api == 'harbor'
+            result = cmd!("curl -s -u '#{dockerauth(uri.host)}' -X POST '#{uri}/api/v2.0/projects/#{newproject}/repositories/#{registry}/artifacts?from=#{repo}:#{newtag}' -o -", capture: true).strip
+          else
+            raise "Unable to promote image #{repo} -> #{newrepo} with #{api.inspect} api: Unimplemented"
+          end
+        end
+
         raise result unless result.empty?
       end
 
-      Image.new(image, newtag)
+      newuri = uri.dup
+      newuri.path = "/#{newrepo}"
+      Image.new(newuri.hostname + newuri.path, newtag)
     end
 
   end

data/lib/retag/service.rb

@@ -5,20 +5,21 @@ module Retag
 
     include Retag::Utils
 
-    attr_reader :name, :config, :repo, :release, :suffix
+    attr_reader :name, :config, :repo, :release, :suffix, :api
 
     delegate :revision, :branch, to: :repo
 
-    def initialize(name, config, release, branch:, suffix:)
+    def initialize(name, config, release, branch:, suffix:, api:)
       @name = name
       @config = config
       @repo = Retag::Repo.new(config['repo'], branch)
       @release = release
       @suffix = suffix
+      @api = api
     end
 
     def images
-      @images ||= config['images'].map{|img| Retag::Image.new(img, revision, suffix: @suffix) }
+      @images ||= config['images'].map{|img| Retag::Image.new(img, revision, suffix: @suffix, api: api) }
     end
   end
 end

data/lib/retag/version.rb

@@ -2,7 +2,7 @@
 
 module Retag
 
-  VERSION = '0.1.11'
+  VERSION = '0.2.2'
 
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retag
 version: !ruby/object:Gem::Version
-  version: 0.1.11.286383
+  version: 0.2.2.290087
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-01-29 00:00:00.000000000 Z
+date: 2025-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler