Merge pull request #227 from StackVista/stac-0-fix-dind

STAC-0: Use correct docker image path

Author: craffit

.gitlab-ci-arm.yml

@@ -135,9 +135,9 @@ publish_binaries:
     - cd $CI_PROJECT_DIR/packaging && ./publish_staging_package.sh
 
 .docker_build:
-  image: ${REGISTRY_DOCKER_URL}/docker:20
+  image: ${REGISTRY_DOCKER_URL}/library/docker:20
   services:
-    - name: ${REGISTRY_DOCKER_URL}/docker:20-dind
+    - name: ${REGISTRY_DOCKER_URL}/library/docker:20-dind
       alias: docker
   variables:
     DOCKER_DRIVER: overlay

.gitlab-ci-docker.yml

@@ -8,16 +8,16 @@ services:
     command:
       - --experimental
       - --tls=false
-    name: ${REGISTRY_DOCKER_URL}/docker:20-dind
+    name: ${REGISTRY_DOCKER_URL}/library/docker:20-dind
 
 stages:
   - merge-manifest
   - acceptance
 
 merge-manifest:
   stage: merge-manifest
-  image: ${REGISTRY_DOCKER_URL}/docker:20-git
+  image: ${REGISTRY_DOCKER_URL}/library/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"
-    - docker manifest push "${DST_REPOSITORY}:${DST_TAG}"
+    - docker manifest push "${DST_REPOSITORY}:${DST_TAG}"

.gitlab-ci-x64.yml

@@ -135,9 +135,9 @@ publish_binaries:
     - cd $CI_PROJECT_DIR/packaging && ./publish_staging_package.sh
 
 .docker_build:
-  image: ${REGISTRY_DOCKER_URL}/docker:20
+  image: ${REGISTRY_DOCKER_URL}/library/docker:20
   services:
-    - name: ${REGISTRY_DOCKER_URL}/docker:20-dind
+    - name: ${REGISTRY_DOCKER_URL}/library/docker:20-dind
       alias: docker
   variables:
     DOCKER_DRIVER: overlay

.gitlab-ci.yml

@@ -87,13 +87,13 @@ 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: ${REGISTRY_DOCKER_URL}/docker:20
+  image: ${REGISTRY_DOCKER_URL}/library/docker:20
   services:
     - alias: docker
       command:
         - --experimental
         - --tls=false
-      name: ${REGISTRY_DOCKER_URL}/docker:20-dind
+      name: ${REGISTRY_DOCKER_URL}/library/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