From b213655855777c4b4730a52c53930f6dc2b4ab72 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 21 Sep 2023 12:01:11 +0100 Subject: [PATCH] De-duplicate podman tag/push commands The commands are identical across the three hosts. Just flesh that into a simple for loop. Signed-off-by: Emil Velikov --- .gitlab-ci.yml | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d11c227..a7333b4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -161,26 +161,18 @@ image:publish:secure: -f "$CI_PROJECT_DIR/Dockerfile.$GROUP" -t "archlinux:$GROUP-$BUILD_VERSION" "$CI_PROJECT_DIR" - - podman tag "archlinux:$GROUP-$BUILD_VERSION" "docker.io/archlinux/archlinux:$GROUP" - - podman tag "archlinux:$GROUP-$BUILD_VERSION" "docker.io/archlinux/archlinux:$GROUP-$BUILD_VERSION" - - podman tag "archlinux:$GROUP-$BUILD_VERSION" "quay.io/archlinux/archlinux:$GROUP" - - podman tag "archlinux:$GROUP-$BUILD_VERSION" "quay.io/archlinux/archlinux:$GROUP-$BUILD_VERSION" - - podman tag "archlinux:$GROUP-$BUILD_VERSION" "ghcr.io/archlinux/archlinux:$GROUP" - - podman tag "archlinux:$GROUP-$BUILD_VERSION" "ghcr.io/archlinux/archlinux:$GROUP-$BUILD_VERSION" - - podman push "docker.io/archlinux/archlinux:$GROUP" - - podman push --sign-by-sigstore=<(sed "s/TEMPLATE_OIDC_ID_TOKEN/${SIGSTORE_ID_TOKEN}/" sigstore-param-file.yaml) "docker.io/archlinux/archlinux:$GROUP-$BUILD_VERSION" - - podman push "quay.io/archlinux/archlinux:$GROUP" - - podman push --sign-by-sigstore=<(sed "s/TEMPLATE_OIDC_ID_TOKEN/${SIGSTORE_ID_TOKEN}/" sigstore-param-file.yaml) "quay.io/archlinux/archlinux:$GROUP-$BUILD_VERSION" - - podman push "ghcr.io/archlinux/archlinux:$GROUP" - - podman push --sign-by-sigstore=<(sed "s/TEMPLATE_OIDC_ID_TOKEN/${SIGSTORE_ID_TOKEN}/" sigstore-param-file.yaml) "ghcr.io/archlinux/archlinux:$GROUP-$BUILD_VERSION" - - if [[ "$GROUP" == "base" ]]; then - podman tag "archlinux:$GROUP-$BUILD_VERSION" "docker.io/archlinux/archlinux:latest"; - podman tag "archlinux:$GROUP-$BUILD_VERSION" "quay.io/archlinux/archlinux:latest"; - podman tag "archlinux:$GROUP-$BUILD_VERSION" "ghcr.io/archlinux/archlinux:latest"; - podman push "docker.io/archlinux/archlinux:latest"; - podman push "quay.io/archlinux/archlinux:latest"; - podman push "ghcr.io/archlinux/archlinux:latest"; - fi + - | + for host in "docker.io" "quay.io" "ghcr.io"; do + podman tag "archlinux:$GROUP-$BUILD_VERSION" "$host/archlinux/archlinux:$GROUP" + podman tag "archlinux:$GROUP-$BUILD_VERSION" "$host/archlinux/archlinux:$GROUP-$BUILD_VERSION" + podman push "$host/archlinux/archlinux:$GROUP" + podman push --sign-by-sigstore=<(sed "s/TEMPLATE_OIDC_ID_TOKEN/${SIGSTORE_ID_TOKEN}/" sigstore-param-file.yaml) "$host/archlinux/archlinux:$GROUP-$BUILD_VERSION" + + if [[ "$GROUP" == "base" ]]; then + podman tag "archlinux:$GROUP-$BUILD_VERSION" "$host/archlinux/archlinux:latest" + podman push "$host/archlinux/archlinux:latest" + fi + done .test: