From 9dbef231196487f4f0bf631aee89ad2753f41eef Mon Sep 17 00:00:00 2001
From: fredbcode <numsys@free.fr>
Date: Mon, 3 May 2021 16:54:25 +0200
Subject: [PATCH] Test compil on arm

---
 .gitlab-ci.yml              |  6 +++-
 gitlabci/docker-hub-arm.yml | 59 +++++++++++++++++++++++++++++++++++++
 gitlabci/docker-hub.yml     | 12 ++++----
 3 files changed, 70 insertions(+), 7 deletions(-)
 create mode 100644 gitlabci/docker-hub-arm.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 66f4d18..ac6a723 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,10 @@ stages:
   - Docker-hub-build
   - Docker-hub-test
   - Docker-hub-pushtag
-
+# ARM
+  - Docker-hub-build
+  - Docker-hub-test
+  - Docker-hub-pushtag
 include:
   - 'gitlabci/docker-hub.yml'
+  - 'gitlabci/docker-hub-arm.yml'
diff --git a/gitlabci/docker-hub-arm.yml b/gitlabci/docker-hub-arm.yml
new file mode 100644
index 0000000..9e91e21
--- /dev/null
+++ b/gitlabci/docker-hub-arm.yml
@@ -0,0 +1,59 @@
+variables:
+  CONTAINER_CLIENT_IMAGE: debian:buster      
+  CONTAINER_TEST_NAME: squid
+  CONTAINER_BUILD_NOPROD_NAME: $HUB_REGISTRY_IMAGE:build-noprod
+  SQUID_VERSION: '"$SQUID_VERSION"'
+rules:
+  allow_failure: true
+
+docker-hub-build:
+  stage: Docker-hub-build
+  image: docker:dind
+  tags:
+    - arm
+  artifacts:
+    expire_in: 2 days
+  timeout: 3 hours 30 minutes
+  before_script:
+    - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_TOKEN" $DOCKER_HUB_REGISTRY
+  script:
+    - 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 --pull -t $CONTAINER_BUILD_NOPROD_NAME .
+    - docker push $CONTAINER_BUILD_NOPROD_NAME
+
+.services:
+  services:
+    - name: $CONTAINER_BUILD_NOPROD_NAME
+      alias: squid
+  image: $CONTAINER_CLIENT_IMAGE
+
+docker-hub-test:
+  stage: Docker-hub-test
+  extends: .services
+  tags:
+    - arm
+  artifacts:
+  script:
+    - apt update && apt install -y curl
+    - export https_proxy=http://$CONTAINER_TEST_NAME:3128 && curl -k https://www.google.fr
+  variables:
+    HOSTNAME: squidpipeline
+
+push-docker-hub:
+  stage: Docker-hub-pushtag
+  image: docker:dind
+  tags:
+    - arm
+  artifacts:
+  before_script:
+    - 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
+    - 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 
+    - docker push $HUB_REGISTRY_IMAGE:$SQUID_VERSION
+  variables:
+    GIT_STRATEGY: none
diff --git a/gitlabci/docker-hub.yml b/gitlabci/docker-hub.yml
index 1252af6..26c5301 100644
--- a/gitlabci/docker-hub.yml
+++ b/gitlabci/docker-hub.yml
@@ -1,3 +1,9 @@
+variables:
+  CONTAINER_CLIENT_IMAGE: debian:buster      
+  CONTAINER_TEST_NAME: squid
+  CONTAINER_BUILD_NOPROD_NAME: $HUB_REGISTRY_IMAGE:build-noprod
+  SQUID_VERSION: '"$SQUID_VERSION"'
+
 docker-hub-build:
   stage: Docker-hub-build
   image: docker:dind
@@ -13,12 +19,6 @@ docker-hub-build:
     - docker build --build-arg SQUID_VERSION=$SQUID_VERSION --pull -t $CONTAINER_BUILD_NOPROD_NAME .
     - docker push $CONTAINER_BUILD_NOPROD_NAME
 
-variables:
-  CONTAINER_CLIENT_IMAGE: debian:buster      
-  CONTAINER_TEST_NAME: squid
-  CONTAINER_BUILD_NOPROD_NAME: $HUB_REGISTRY_IMAGE:build-noprod
-  SQUID_VERSION: '"$SQUID_VERSION"'
-
 .services:
   services:
     - name: $CONTAINER_BUILD_NOPROD_NAME