retag 0.2.3.292162 → 0.2.5.292559

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7ddd54552ea5d4a5246b1b93d35455d13b5134625d589049a0b33a141d1b284
-  data.tar.gz: 7833bafabc8df095f7e2c2ab82cc4507142887430873d925aa155b43a5a3e29f
+  metadata.gz: 90d9bfab918098f2487693ffde7bbde4840ececd02b8a3805ae62545ca848c26
+  data.tar.gz: a71c3e364ca9eb549462e46abada8ccf5cb691e5e23f044bec05a24fef818141
 SHA512:
-  metadata.gz: 065bb196dced3c82fe22fdae678e27dd426eddf8c209300dbd9636b49daf039f74a610582f1390795d82b6f65b78c124189b9d8fe2bd536c31de235b1b192319
-  data.tar.gz: 1dd9cc1e109b517620f58b55449381966ca20c64b78e38efb220b9fbc9656a45b1c263f3c0b8f1cd931312308c98ee136f0810192c7e6c72750d5aa67e5c60e7
+  metadata.gz: 3ed632175b194d63a8f7e937fd60005f5edd5f30ffc318d8db91b898710ee055d52e4f2bfdb9d9bc8373d595345f0476566be095b01bd275434fe954440378b1
+  data.tar.gz: 59d3aebec259f3eaad3f460ac4123d935631f51504184eb0bf804e6c936247b253030ed92c387c40627e02c90f3313d0ed5d8f72e41415804a6dd62b8e880174

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    retag (0.2.3)
+    retag (0.2.5)
       activesupport (~> 6.0)
       colorize (~> 0.8.1)
       gitlab (< 5.0)

data/lib/retag/image.rb

@@ -5,7 +5,7 @@ module Retag
   class Image
 
     include Utils
-    attr_reader :full, :image, :tag, :api
+    attr_reader :full, :image, :tag, :api, :repo, :uri
 
     def initialize(image, tag, suffix: nil, api: nil)
       @image = image
@@ -13,48 +13,60 @@ module Retag
       @tag = "#{@tag}-#{suffix}" if suffix.present?
       @full = "#{@image}:#{@tag}"
       @api = api
+
+      @uri = ::URI.parse("https://#{@image}").normalize
+      @repo = @uri.path
+      @repo[0..0] = ''
+      @uri.path = ''
     end
 
-    def retag!(newtag = tag, newproject: nil)
-      uri = ::URI.parse("https://#{image}")
-      repo = uri.path
-      repo[0..0] = ''
+    MANIFEST_CONTENT_TYPE = 'application/vnd.docker.distribution.manifest.v2+json'
 
-      project, *_ = repo.split('/')
-      registry = repo.split('/').join('-')
-      uri.path = ''
+    def retag!(newtag = tag, newproject: nil)
+      project, *_rest = repo.split('/')
+      registry = repo
       newrepo = "#{newproject}/#{registry}"
 
-      content_type = 'application/vnd.docker.distribution.manifest.v2+json'
-
       Tempfile.create('manifest') do |file|
-        manifest = JSON.parse(cmd!("curl -s -u '#{dockerauth(uri.host)}' -H 'Accept: #{content_type}' '#{uri}/v2/#{repo}/manifests/#{tag}' -o -", capture: true).strip)
-        raise manifest.inspect unless manifest.dig('layers') || manifest.dig('config') || manifest.dig('manifests')
-
+        manifest = get_manifest
         file.write(manifest.to_json)
         file.flush
 
         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
+          result = cmd!("curl -s -u '#{dockerauth(uri.host)}' -H 'Content-Type: #{MANIFEST_CONTENT_TYPE}' -H 'Accept: #{MANIFEST_CONTENT_TYPE}' -X PUT --data-binary @#{file.path} '#{uri}/v2/#{repo}/manifests/#{newtag}' -o -", capture: true).strip
           raise result unless result.empty?
         end
 
-        if project != newproject
-          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
+        if newproject && project != newproject
+          unless api == 'harbor'
             raise "Unable to promote image #{repo} -> #{newrepo} with #{api.inspect} api: Unimplemented"
           end
+
+          newregistry = registry.split('/').join('-')
+          newrepo = "#{newproject}/#{newregistry}"
+          
+          result = cmd!(
+            "curl -s -u '#{dockerauth(uri.host)}' -X POST '#{uri}/api/v2.0/projects/#{newproject}/repositories/#{newregistry}/artifacts?from=#{repo}:#{newtag}' -o -", capture: true
+          ).strip
         end
 
         raise result unless result.empty?
       end
 
       newuri = uri.dup
-      newuri.path = "/#{newrepo}"
+      newuri.path = "/#{newrepo}".gsub('//', '/')
       Image.new(newuri.hostname + newuri.path, newtag)
     end
 
+    def get_manifest
+      manifest = JSON.parse(cmd!("curl -s -u '#{dockerauth(uri.host)}' -H 'Accept: #{MANIFEST_CONTENT_TYPE}' '#{uri}/v2/#{repo}/manifests/#{tag}' -o -", capture: true).strip)
+      unless manifest.dig('layers') || manifest.dig('config') || manifest.dig('manifests')
+        raise manifest.inspect
+      end
+
+      manifest
+    end
+
   end
 end
 

data/lib/retag/utils.rb

@@ -1,5 +1,6 @@
 require 'base64'
 require 'open3'
+require 'colorize'
 
 module Retag
   module Utils
@@ -12,6 +13,8 @@ module Retag
 
       logger.tagged("CMD#{tag}".colorize(:light_black)) { logger.debug cmd.colorize(:light_black) }
 
+      return output if $dryrun
+
       code = Open3.popen3(cmd) do |stdin, stdout, stderr, thr|
         stdin.close_write
         files = [stdout, stderr]

data/lib/retag/version.rb

@@ -2,7 +2,7 @@
 
 module Retag
 
-  VERSION = '0.2.3'
+  VERSION = '0.2.5'
 
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retag
 version: !ruby/object:Gem::Version
-  version: 0.2.3.292162
+  version: 0.2.5.292559
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-02-28 00:00:00.000000000 Z
+date: 2025-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler