From 1b936b0d401f1926825f81ecf2990135482bbd59 Mon Sep 17 00:00:00 2001 From: Moss Cantwell Date: Tue, 3 Sep 2024 15:28:46 +1200 Subject: [PATCH 1/2] fix: add skopeo to vendored software github uses an old version of skopeo and we need an updated one for semver support --- .github/workflows/sync.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index e6fed6d..d06a7ae 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -43,16 +43,15 @@ jobs: - name: dry run copy to ghcr.io env: GH_TOKEN: ${{ secrets.GH_CI_USER_TOKEN }} - run: | - skopeo sync --dry-run --all --src yaml --dest docker sync-ghcr.yml ghcr.io/geonet/base-images + podman run --env-host -v '${PWD}/src' -w /src quay.io/skopeo/stable:latest sync --dry-run --all --src yaml --dest docker sync-ghcr.yml ghcr.io/geonet/base-images - name: copy to ghcr.io env: GH_TOKEN: ${{ secrets.GH_CI_USER_TOKEN }} run: | - skopeo sync --all --keep-going --src yaml --dest docker sync-ghcr.yml ghcr.io/geonet/base-images + podman run --env-host -v '${PWD}/src' -w /src quay.io/skopeo/stable:latest sync --all --keep-going --src yaml --dest docker sync-ghcr.yml ghcr.io/geonet/base-images if: github.ref_name == 'main' - name: copy to ecr run: | - skopeo sync --all --src yaml --dest docker sync-ecr.yml ${{ env.ecr }} + podman run --env-host -v '${PWD}/src' -w /src quay.io/skopeo/stable:latest sync --all --src yaml --dest docker sync-ecr.yml 862640294325.dkr.ecr.ap-southeast-2.amazonaws.com if: github.ref_name == 'main' From 4e3053996720e93ab73682b96841b942c098912f Mon Sep 17 00:00:00 2001 From: Moss Cantwell Date: Tue, 3 Sep 2024 15:31:38 +1200 Subject: [PATCH 2/2] feat: add podman runtime for sync to use up to date skopeo from our vendored copy --- .github/workflows/sync.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index d06a7ae..43573e4 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -44,14 +44,14 @@ jobs: env: GH_TOKEN: ${{ secrets.GH_CI_USER_TOKEN }} run: | - podman run --env-host -v '${PWD}/src' -w /src quay.io/skopeo/stable:latest sync --dry-run --all --src yaml --dest docker sync-ghcr.yml ghcr.io/geonet/base-images + podman run --env-host -v "${PWD}:/src" -w /src ghcr.io/geonet/base-images/stable:v1.16 sync --dry-run --all --src yaml --dest docker sync-ghcr.yml ghcr.io/geonet/base-images - name: copy to ghcr.io env: GH_TOKEN: ${{ secrets.GH_CI_USER_TOKEN }} run: | - podman run --env-host -v '${PWD}/src' -w /src quay.io/skopeo/stable:latest sync --all --keep-going --src yaml --dest docker sync-ghcr.yml ghcr.io/geonet/base-images + podman run --env-host -v "${PWD}:/src" -w /src ghcr.io/geonet/base-images/stable:v1.16 sync --all --keep-going --src yaml --dest docker sync-ghcr.yml ghcr.io/geonet/base-images if: github.ref_name == 'main' - name: copy to ecr run: | - podman run --env-host -v '${PWD}/src' -w /src quay.io/skopeo/stable:latest sync --all --src yaml --dest docker sync-ecr.yml 862640294325.dkr.ecr.ap-southeast-2.amazonaws.com + podman run --env-host -v "${PWD}:/src" -w /src ghcr.io/geonet/base-images/stable:v1.16 sync --all --src yaml --dest docker sync-ecr.yml 862640294325.dkr.ecr.ap-southeast-2.amazonaws.com if: github.ref_name == 'main'