From fd5cf49fa6e10cb909a395e199789d25c45ec5b5 Mon Sep 17 00:00:00 2001 From: eaudetcobello Date: Fri, 24 May 2024 09:01:13 -0400 Subject: [PATCH] Review comments --- .github/workflows/sync-registry.yaml | 2 +- .../hack/skopeo-config.yaml | 1 + build-scripts/hack/{sync-registry.sh => skopeo-sync.sh} | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) rename .github/data/sync-registry-config.yaml => build-scripts/hack/skopeo-config.yaml (71%) rename build-scripts/hack/{sync-registry.sh => skopeo-sync.sh} (53%) diff --git a/.github/workflows/sync-registry.yaml b/.github/workflows/sync-registry.yaml index 6702e244b..e90d13706 100644 --- a/.github/workflows/sync-registry.yaml +++ b/.github/workflows/sync-registry.yaml @@ -12,4 +12,4 @@ jobs: env: DEST_CREDS: ${{ github.actor }}:${{ secrets.GITHUB_TOKEN }} run: | - ${GITHUB_WORKSPACE}/build-scripts/hack/sync-registry.sh + ${GITHUB_WORKSPACE}/build-scripts/hack/skopeo-sync.sh diff --git a/.github/data/sync-registry-config.yaml b/build-scripts/hack/skopeo-config.yaml similarity index 71% rename from .github/data/sync-registry-config.yaml rename to build-scripts/hack/skopeo-config.yaml index b2948eb9f..965313692 100644 --- a/.github/data/sync-registry-config.yaml +++ b/build-scripts/hack/skopeo-config.yaml @@ -1,3 +1,4 @@ registry.k8s.io: images-by-semver: pause: "= 3.7" + skopeo: ">= 1.15" diff --git a/build-scripts/hack/sync-registry.sh b/build-scripts/hack/skopeo-sync.sh similarity index 53% rename from build-scripts/hack/sync-registry.sh rename to build-scripts/hack/skopeo-sync.sh index 09b8a1356..90aa3630a 100755 --- a/build-scripts/hack/sync-registry.sh +++ b/build-scripts/hack/skopeo-sync.sh @@ -1,6 +1,6 @@ #!/bin/bash -docker run -v "${GITHUB_WORKSPACE}/.github/data/sync-registry-config.yaml":/config.yaml quay.io/skopeo/stable:v1.15 sync \ +docker run -v "./skopeo-config.yaml":/config.yaml quay.io/skopeo/stable:v1.15 sync \ --src yaml \ --dest docker \ /config.yaml ghcr.io/canonical \