Merge pull request #217 from StackVista/STAC-23168

STAC-23168 Fix failing retag job.

Author: Andreagit97

.gitlab-ci-arm.yml

@@ -14,7 +14,7 @@ variables:
   QUAY_REGISTRY: quay.io
   DOCKER_REGISTRY: docker.io
   VERSION_LOGIC: '(if [ "$${CI_COMMIT_TAG}" == "" ]; then echo "$${CI_COMMIT_SHORT_SHA}"; else echo "$${CI_COMMIT_TAG}"; fi);'
-  LINUX_BUILDER: ${DOCKER_PROXY_URL}/stackstate/datadog_build_deb_arm64:61b4ad67
+  LINUX_BUILDER: ${REGISTRY_QUAY_URL}/stackstate/datadog_build_deb_arm64:61b4ad67
   GOPATH: "$CI_PROJECT_DIR/.go"
 
 .go_process_agent_cache:
@@ -66,7 +66,7 @@ prebuild_agent:
         - prebuild_artifacts/artifacts/*
   stage: prebuild
   needs: [ dependencies ]
-  image: ${DOCKER_PROXY_URL}/stackstate/datadog_build_system-probe_arm64:61b4ad67
+  image: ${REGISTRY_QUAY_URL}/stackstate/datadog_build_system-probe_arm64:61b4ad67
   tags:
     - sts-k8s-xl-arm64-runner
   script:
@@ -135,9 +135,9 @@ publish_binaries:
     - cd $CI_PROJECT_DIR/packaging && ./publish_staging_package.sh
 
 .docker_build:
-  image: ${DOCKER_PROXY_URL}/docker:20
+  image: ${REGISTRY_DOCKER_URL}/docker:20
   services:
-    - name: ${DOCKER_PROXY_URL}/docker:20-dind
+    - name: ${REGISTRY_DOCKER_URL}/docker:20-dind
       alias: docker
   variables:
     DOCKER_DRIVER: overlay

.gitlab-ci-docker.yml

@@ -8,15 +8,15 @@ services:
     command:
       - --experimental
       - --tls=false
-    name: ${DOCKER_PROXY_URL}/docker:20-dind
+    name: ${REGISTRY_DOCKER_URL}/docker:20-dind
 
 stages:
   - merge-manifest
   - acceptance
 
 merge-manifest:
   stage: merge-manifest
-  image: ${DOCKER_PROXY_URL}/docker:20-git
+  image: ${REGISTRY_DOCKER_URL}/docker:20-git
   script:
     - echo "${quay_password}" | docker login --username=${quay_user} --password-stdin quay.io
     - docker manifest create "${DST_REPOSITORY}:${DST_TAG}" --amend "${DST_REPOSITORY}:${DST_TAG}-amd64" --amend "${DST_REPOSITORY}:${DST_TAG}-arm64"

.gitlab-ci-x64.yml

@@ -14,7 +14,7 @@ variables:
   QUAY_REGISTRY: quay.io
   DOCKER_REGISTRY: docker.io
   VERSION_LOGIC: '(if [ "$${CI_COMMIT_TAG}" == "" ]; then echo "$${CI_COMMIT_SHORT_SHA}"; else echo "$${CI_COMMIT_TAG}"; fi);'
-  LINUX_BUILDER: ${DOCKER_PROXY_URL}/stackstate/datadog_build_deb_x64:61b4ad67
+  LINUX_BUILDER: ${REGISTRY_QUAY_URL}/stackstate/datadog_build_deb_x64:61b4ad67
   GOPATH: "$CI_PROJECT_DIR/.go"
 
 .go_process_agent_cache:
@@ -66,7 +66,7 @@ prebuild_agent:
         - prebuild_artifacts/artifacts/*
   stage: prebuild
   needs: [ dependencies ]
-  image: ${DOCKER_PROXY_URL}/stackstate/datadog_build_system-probe_x64:61b4ad67
+  image: ${REGISTRY_QUAY_URL}/stackstate/datadog_build_system-probe_x64:61b4ad67
   tags:
     - sts-k8s-xl-runner
   script:
@@ -135,9 +135,9 @@ publish_binaries:
     - cd $CI_PROJECT_DIR/packaging && ./publish_staging_package.sh
 
 .docker_build:
-  image: ${DOCKER_PROXY_URL}/docker:20
+  image: ${REGISTRY_DOCKER_URL}/docker:20
   services:
-    - name: ${DOCKER_PROXY_URL}/docker:20-dind
+    - name: ${REGISTRY_DOCKER_URL}/docker:20-dind
       alias: docker
   variables:
     DOCKER_DRIVER: overlay

.gitlab-ci.yml

@@ -69,7 +69,7 @@ beest_k8s_1_33_containerd_trigger_verification:
 notify-on-master-fail:
   before_script:
     - apk add --no-cache bash curl
-  image: ${DOCKER_PROXY_URL}/library/alpine:latest
+  image: ${REGISTRY_DOCKER_URL}/library/alpine:latest
   only:
     - master
   script:
@@ -87,11 +87,16 @@ notify-on-master-fail:
 # QUAY_IMAGE: the full URL of the destination image on Quay `(e.g. quay.io/stackstate/stackstate-k8s-process-agent:latest-amd64)`
 push_image_to_quay:
   stage: postbuild
-  image: ${DOCKER_PROXY_URL}/docker:20
+  image: ${REGISTRY_DOCKER_URL}/docker:20
   services:
-    - name: ${DOCKER_PROXY_URL}/docker:20-dind
+    - alias: docker
+      command:
+        - --experimental
+        - --tls=false
+      name: ${REGISTRY_DOCKER_URL}/docker:20-dind
   variables:
     # We cannot access the host docker socket in GitLab CI, so we need to use the Docker-in-Docker service
+    DOCKER_DRIVER: overlay2
     DOCKER_HOST: tcp://docker:2375
     DOCKER_TLS_CERTDIR: ""
   script: