From 24bc785e5c8a9bde9fef9d34e77e4ad2485f0b7e Mon Sep 17 00:00:00 2001
From: fredbcode <numsys@free.fr>
Date: Tue, 4 May 2021 13:52:03 +0200
Subject: [PATCH] Tag archi build-noprod

---
 gitlabci/docker-hub-arm.yml | 8 ++++----
 gitlabci/docker-hub.yml     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gitlabci/docker-hub-arm.yml b/gitlabci/docker-hub-arm.yml
index 77f3eaf..8718cbc 100644
--- a/gitlabci/docker-hub-arm.yml
+++ b/gitlabci/docker-hub-arm.yml
@@ -1,7 +1,7 @@
 variables:
   CONTAINER_CLIENT_IMAGE: debian:buster      
   CONTAINER_TEST_NAME: squid
-  CONTAINER_BUILD_NOPROD_NAME: $HUB_REGISTRY_IMAGE:build-noprod-arm
+  CONTAINER_BUILD_NOPROD_NAME_ARM: $HUB_REGISTRY_IMAGE:build-noprod-arm
   SQUID_VERSION: '"$SQUID_VERSION"'
 
 docker-hub-build-arm:
@@ -18,8 +18,8 @@ docker-hub-build-arm:
     - cd $CI_PROJECT_DIR
     - apk add --no-cache curl
     - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v4/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1)
-    - docker build -f Dockerfile.arm --build-arg SQUID_VERSION=$SQUID_VERSION --pull -t $CONTAINER_BUILD_NOPROD_NAME .
-    - docker push $CONTAINER_BUILD_NOPROD_NAME
+    - docker build -f Dockerfile.arm --build-arg SQUID_VERSION=$SQUID_VERSION --pull -t $CONTAINER_BUILD_NOPROD_NAME_ARM .
+    - docker push $CONTAINER_BUILD_NOPROD_NAME_ARM
 
 .services:
   services:
@@ -52,7 +52,7 @@ push-docker-hub-arm:
     - apk add --no-cache curl
     - docker pull $CONTAINER_BUILD_NOPROD_NAME
     - 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 $HUB_REGISTRY_IMAGE:$SQUID_VERSION-arm 
+    - docker tag $CONTAINER_BUILD_NOPROD_NAME_ARM $HUB_REGISTRY_IMAGE:$SQUID_VERSION-arm 
     - docker push $HUB_REGISTRY_IMAGE:$SQUID_VERSION-arm
   variables:
     GIT_STRATEGY: none
diff --git a/gitlabci/docker-hub.yml b/gitlabci/docker-hub.yml
index 0201c75..22bb5b9 100644
--- a/gitlabci/docker-hub.yml
+++ b/gitlabci/docker-hub.yml
@@ -1,7 +1,7 @@
 variables:
   CONTAINER_CLIENT_IMAGE: debian:buster      
   CONTAINER_TEST_NAME: squid
-  CONTAINER_BUILD_NOPROD_NAME: $HUB_REGISTRY_IMAGE:build-noprod-amd64
+  CONTAINER_BUILD_NOPROD_NAME_AMD64: $HUB_REGISTRY_IMAGE:build-noprod-amd64
   SQUID_VERSION: '"$SQUID_VERSION"'
 
 docker-hub-build:
@@ -16,8 +16,8 @@ docker-hub-build:
     - cd $CI_PROJECT_DIR
     - apk add --no-cache curl
     - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v4/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1)
-    - docker build --build-arg SQUID_VERSION=$SQUID_VERSION --platform linux/amd64--pull -t $CONTAINER_BUILD_NOPROD_NAME .
-    - docker push $CONTAINER_BUILD_NOPROD_NAME
+    - docker build --build-arg SQUID_VERSION=$SQUID_VERSION --pull -t $CONTAINER_BUILD_NOPROD_NAME_AMD64 .
+    - docker push $CONTAINER_BUILD_NOPROD_NAME_AMD64
 
 .services:
   services:
@@ -44,7 +44,7 @@ push-docker-hub:
     - apk add --no-cache curl
     - docker pull $CONTAINER_BUILD_NOPROD_NAME
     - 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 $HUB_REGISTRY_IMAGE:$SQUID_VERSION-amd64 
+    - docker tag $CONTAINER_BUILD_NOPROD_NAME_AMD64 $HUB_REGISTRY_IMAGE:$SQUID_VERSION-amd64 
     - docker push $HUB_REGISTRY_IMAGE:$SQUID_VERSION-amd64
   variables:
     GIT_STRATEGY: none