retag 0.2.3.292145 → 0.2.4.292196

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfd82cee3c87de048b6214ef7a0173613f95b37dfd8b319f8390db1435f9991d
-  data.tar.gz: ea57ecd03f22ca187b4451e2fe74afb600c4406f6138cd830b9c9ab3cdb4b5d9
+  metadata.gz: 320ce12c46e6e61bc78b7007c8baf2c8d66b20490e22a0117dc6593eba9d9f45
+  data.tar.gz: d4251f9933060d9a0edd218927229bc24f9195a347624f8b3f5b5cca6ad8c11e
 SHA512:
-  metadata.gz: 477a6516d475c3d67374c2d12b95add4d058ef735e70f3b5bca06d0771f19f61aa55f6fa676567a13b40d57b2533e7de47db547af1e515380d8457011d0e4fdf
-  data.tar.gz: 97b96d075dd8bc143e207d5f3ae070997893de10ce88254f26e2b6e1d77e5740569d139472e200f336692135eef01526cc05d2110f7640c38cbbf953c38653ad
+  metadata.gz: d7e8bd5d28d6fbc783eb4cd4a279ebddd9153427e54507546284bcb1701827286229899260f0bdbad3d315cb04fc87268a91c725ecd9001488d742e8508610ff
+  data.tar.gz: 888f0abf99b2581010b619bf373219c61a6a2a14050f0f1e612f2b66af9f95f7d97619bf1de260de03752ff0efb8a0bcc7840bdbd518b6bd107d404c449d324b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    retag (0.2.3)
+    retag (0.2.4)
       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,58 @@ 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 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
+        if newproject && project != newproject
+          unless api == 'harbor'
             raise "Unable to promote image #{repo} -> #{newrepo} with #{api.inspect} api: Unimplemented"
           end
+
+          newrepo = "#{newproject}/#{registry.split('/').join('-')}"
+          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
         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/version.rb

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

metadata

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