From 97a57eada833b5dd98576c10db97104732de0522 Mon Sep 17 00:00:00 2001 From: Fried Hoeben Date: Tue, 19 Dec 2023 21:50:55 +0100 Subject: [PATCH] use single temp repository --- .circleci/config.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e913b99950..a6a12cb02c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -234,8 +234,9 @@ jobs: AMD_TAG=${VERSION}_amd64-${BUILD_DATE} echo "Creating ${IMAGE_NAME}:${MANIFEST_TAG} based on ${IMAGE_NAME}:${ARM_TAG} and ${IMAGE_NAME}:${AMD_TAG}" MANIFEST_IMAGE=${IMAGE_NAME}:${MANIFEST_TAG} - ARM_IMAGE=${IMAGE_NAME}_arm64:${MANIFEST_TAG} - AMD_IMAGE=${IMAGE_NAME}_amd64:${MANIFEST_TAG} + TEMP_PREFIX=$NAMESPACE/temp:${MANIFEST_TAG}-<< parameters.image-name >> + ARM_IMAGE=${TEMP_PREFIX}-arm64 + AMD_IMAGE=${TEMP_PREFIX}-amd64 docker tag ${IMAGE_NAME}:${ARM_TAG} ${ARM_IMAGE} docker tag ${IMAGE_NAME}:${AMD_TAG} ${AMD_IMAGE} echo "Login to Docker..." @@ -284,7 +285,8 @@ jobs: AMD_TAG=${VERSION}_amd64-${BUILD_DATE} echo "Creating ${IMAGE_NAME}:${MANIFEST_TAG} based on ${IMAGE_NAME}:${AMD_TAG}" MANIFEST_IMAGE=${IMAGE_NAME}:${MANIFEST_TAG} - AMD_IMAGE=${IMAGE_NAME}_amd64:${MANIFEST_TAG} + TEMP_PREFIX=$NAMESPACE/temp:${MANIFEST_TAG}-<< parameters.image-name >> + AMD_IMAGE=${TEMP_PREFIX}-amd64 docker tag ${IMAGE_NAME}:${AMD_TAG} ${AMD_IMAGE} echo "${DOCKER_TEST_PASSWORD}" | docker login --username "${DOCKER_TEST_USERNAME}" --password-stdin docker push ${AMD_IMAGE} @@ -329,7 +331,8 @@ jobs: AMD_TAG=${VERSION}_amd64-${BUILD_DATE} echo "Creating ${IMAGE_NAME}:${MANIFEST_TAG} based on ${IMAGE_NAME}:${AMD_TAG}" MANIFEST_IMAGE=${IMAGE_NAME}:${MANIFEST_TAG} - AMD_IMAGE=${IMAGE_NAME}_amd64:${MANIFEST_TAG} + TEMP_PREFIX=$NAMESPACE/temp:${MANIFEST_TAG}-<< parameters.image-name >> + AMD_IMAGE=${TEMP_PREFIX}-amd64 docker tag ${IMAGE_NAME}:${AMD_TAG} ${AMD_IMAGE} echo "${DOCKER_TEST_PASSWORD}" | docker login --username "${DOCKER_TEST_USERNAME}" --password-stdin docker push ${AMD_IMAGE}