From ce852e182b463f87f2d1f8e4cf6ca70c6048e4d2 Mon Sep 17 00:00:00 2001 From: fredbcode Date: Tue, 4 May 2021 13:55:51 +0200 Subject: [PATCH] Tag archi build-noprod --- gitlabci/docker-hub-arm.yml | 4 ++-- gitlabci/docker-hub.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitlabci/docker-hub-arm.yml b/gitlabci/docker-hub-arm.yml index 8718cbc..99ab5cd 100644 --- a/gitlabci/docker-hub-arm.yml +++ b/gitlabci/docker-hub-arm.yml @@ -23,7 +23,7 @@ docker-hub-build-arm: .services: services: - - name: $CONTAINER_BUILD_NOPROD_NAME + - name: $CONTAINER_BUILD_NOPROD_NAME_ARM alias: squid image: $CONTAINER_CLIENT_IMAGE @@ -50,7 +50,7 @@ push-docker-hub-arm: - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_TOKEN" $DOCKER_HUB_REGISTRY script: - apk add --no-cache curl - - docker pull $CONTAINER_BUILD_NOPROD_NAME + - docker pull $CONTAINER_BUILD_NOPROD_NAME_ARM - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v4/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1 | sed 's/\.tar\.gz//g') - docker tag $CONTAINER_BUILD_NOPROD_NAME_ARM $HUB_REGISTRY_IMAGE:$SQUID_VERSION-arm - docker push $HUB_REGISTRY_IMAGE:$SQUID_VERSION-arm diff --git a/gitlabci/docker-hub.yml b/gitlabci/docker-hub.yml index 22bb5b9..899eaed 100644 --- a/gitlabci/docker-hub.yml +++ b/gitlabci/docker-hub.yml @@ -21,7 +21,7 @@ docker-hub-build: .services: services: - - name: $CONTAINER_BUILD_NOPROD_NAME + - name: $CONTAINER_BUILD_NOPROD_NAME_AMD64 alias: squid image: $CONTAINER_CLIENT_IMAGE @@ -42,7 +42,7 @@ push-docker-hub: - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_TOKEN" $DOCKER_HUB_REGISTRY script: - apk add --no-cache curl - - docker pull $CONTAINER_BUILD_NOPROD_NAME + - docker pull $CONTAINER_BUILD_NOPROD_NAME_AMD64 - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v4/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1 | sed 's/\.tar\.gz//g') - docker tag $CONTAINER_BUILD_NOPROD_NAME_AMD64 $HUB_REGISTRY_IMAGE:$SQUID_VERSION-amd64 - docker push $HUB_REGISTRY_IMAGE:$SQUID_VERSION-amd64