Add --all to skopeo copy from insecure registry

skopeo needs to be told to copy all instances of a given image, otherwise it just grabs one of them. containers/skopeo#741 Change-Id: If78ad50602e745ef7747d983b987cf964ff6e67f
g-chauvel · May 8, 2020 · 5f31625 · 5f31625
1 parent bac2bf6
commit 5f31625
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/roles/pull-from-intermediate-registry/tasks/main.yaml b/roles/pull-from-intermediate-registry/tasks/main.yaml
@@ -83,7 +83,7 @@
   block:
     - name: Pull artifacts from intermediate registry
       command: >-
-        skopeo --insecure-policy copy
+        skopeo --insecure-policy copy --all
         {{ zj_zuul_artifact.url }}
         docker://127.0.0.1:{{ socat_port }}/{{ zj_zuul_artifact.metadata.repository | regex_replace('^docker\.io/(.*)', '\1') }}:{{ zj_zuul_artifact.metadata.tag }}
       retries: 3

diff --git a/roles/push-to-intermediate-registry/tasks/push-image.yaml b/roles/push-to-intermediate-registry/tasks/push-image.yaml
@@ -4,7 +4,7 @@
 # name, we strip it here.
 - name: Push tag to intermediate registry
   command: >-
-    skopeo --insecure-policy copy
+    skopeo --insecure-policy copy --all
     docker://127.0.0.1:{{ socat_port }}/{{ zj_image.repository | regex_replace('^docker\.io/(.*)', '\1') }}:{{ zj_image_tag }}
     docker://{{ intermediate_registry.host | ipwrap }}:{{ intermediate_registry.port }}/{{ zj_image.repository }}:{{ zuul.build }}_{{ zj_image_tag }}
   retries: 3