pipedawg-vl 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8312b9b65c6fdcd02af00d8300d6dc97c9244bad0a5688882970c7de2e4a4301
-  data.tar.gz: f6c315614e2913320660e8b3272eac8ed58858c432fe1c5a1f2f4aa13e1e6bf7
+  metadata.gz: 2bfe0bf6fb73e02b0ca5cb1715b9e23f98f8dced9902238942ca9bdb2913c1f6
+  data.tar.gz: 34c8434147a023e1aa12180730cb6027c5846fb6c587a4e0b345bbf594ed10a1
 SHA512:
-  metadata.gz: c6d26b123e20f6f17eb9794e298c161770e4c2074958ecf568fd5cc5d27ab4fea75e50cf58e2d89cde52211412ea934f1b62a41226aac146be833fc363c394f4
-  data.tar.gz: 7a41e5569f4ed442c0fc8169a67f9cb986be85cec4dcdb3507e3b6c7d97be13580e3649aa60efb2ccfd4007ab39195b22c84abf7d80fc6dcf31de39d276f9ffa
+  metadata.gz: 6f3e8ea639de3d0cd0d584145a9625c232de03e0de99f82a8fb6dc612d50554cf80da5ffc5906aa7193aa4e17ea5f472098d90a128dda1887862191efcd4f559
+  data.tar.gz: 26d3f2cfb3ffa1c35640ddf755fb052870b1a03e056ef6b00e08d806051b166c205fb2fbb7088eedc3c2a2d4122a2a9878cb4958bc26d5428ec43392ecd2ad97

data/lib/pipedawg/job/skopeo/copy.rb

@@ -7,7 +7,7 @@ module Pipedawg
       class Copy < Job::Skopeo
         def initialize(name, opts = {})
           opts = {
-            config: {}, copy_image: name, destinations: [{ copy_image: nil, flags: [], options: {} }], flags: [],
+            config: {}, copy_image: name, destinations: [{ dest_image_name: nil, copy_image: nil, flags: [], options: {} }], flags: [],
             logins: {}, options: {}, stage: '${CI_PROJECT_DIR}/stage', trusted_ca_cert_source_files: [],
             trusted_ca_cert_target_file: '/etc/docker/certs.d/ca.crt'
           }.merge(opts)
@@ -18,7 +18,7 @@ module Pipedawg
         def update # rubocop:disable Metrics/AbcSize
           require 'json'
           opts[:script] = debug + config + cert_copies + login + mkstage + pull + (
-            opts[:destinations].map { |d| push(d) }
+            opts[:destinations].map.with_index { |d, i| push(d, opts[:dest_image_names][i]) }
           ).flatten(1)
         end
 
@@ -37,13 +37,7 @@ module Pipedawg
 
         def login
           opts.fetch(:logins, {}).map do |k, v|
-            begin
-              command = "echo \"#{v['password']}\" | #{opts[:command]} login --authfile \"${CONFIG}/config.json\" --username \"#{v['username']}\" --password-stdin \"#{k}\"" # rubocop:disable Layout/LineLength
-              `#{command}`
-              puts "Login succeeded for #{k}"
-            rescue RuntimeError => e
-              puts "Login failed for #{k}: #{e.message}"
-            end
+            "echo \"#{v['password']}\" | #{opts[:command]} login --authfile \"${CONFIG}/config.json\" --username \"#{v['username']}\" --password-stdin \"#{k}\" || echo \"Failed to login\"" # rubocop:disable Layout/LineLength
           end
         end
 
@@ -55,8 +49,8 @@ module Pipedawg
           copy(opts, "docker://#{opts[:copy_image]}", "\"dir://#{opts[:stage]}\"")
         end
 
-        def push(destination_opts)
-          copy(destination_opts, "\"dir://#{opts[:stage]}\"", "docker://#{destination_opts[:copy_image]}")
+        def push(destination_opts, dest_image_name)
+          copy(destination_opts, "\"dir://#{opts[:stage]}\"", "docker://#{dest_image_name || destination_opts[:copy_image]}")
         end
 
         def copy(copy_opts, source, destination)

data/lib/pipedawg/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pipedawg
-  VERSION = '1.0.2'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipedawg-vl
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - harbottle
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2023-06-12 00:00:00.000000000 Z
 dependencies: []
 description: Generate GitLab CI pipelines.
 email: