zuul/zuul-jobs
Code Issues Proposed changes

Add --all to skopeo copy from insecure registry

Browse Source 
skopeo needs to be told to copy all instances of a given image,
otherwise it just grabs one of them.

https://github.com/containers/skopeo/pull/741

Change-Id: If78ad50602e745ef7747d983b987cf964ff6e67f
This commit is contained in:
Monty Taylor 2020-05-08 15:22:01 -05:00
parent bac2bf6c45
commit 5f31625a94
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/pull-from-intermediate-registry/tasks/main.yaml
View File

@ -83,7 +83,7 @@
block: block:
- name: Pull artifacts from intermediate registry - name: Pull artifacts from intermediate registry
command: >- command: >-
skopeo --insecure-policy copy skopeo --insecure-policy copy --all
{{ zj_zuul_artifact.url }} {{ 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 }} docker://127.0.0.1:{{ socat_port }}/{{ zj_zuul_artifact.metadata.repository | regex_replace('^docker\.io/(.*)', '\1') }}:{{ zj_zuul_artifact.metadata.tag }}
retries: 3 retries: 3

2
roles/push-to-intermediate-registry/tasks/push-image.yaml
View File

@ -4,7 +4,7 @@
# name, we strip it here. # name, we strip it here.
- name: Push tag to intermediate registry - name: Push tag to intermediate registry
command: >- 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://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 }} docker://{{ intermediate_registry.host | ipwrap }}:{{ intermediate_registry.port }}/{{ zj_image.repository }}:{{ zuul.build }}_{{ zj_image_tag }}
retries: 3 retries: 3