Skip to content

Commit 7a6078a

Browse files
committed
STAC-0: Use correct docker image path
1 parent ea5eea1 commit 7a6078a

5 files changed

Lines changed: 9 additions & 15 deletions

File tree

.gitlab-ci-arm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ publish_binaries:
135135
- cd $CI_PROJECT_DIR/packaging && ./publish_staging_package.sh
136136

137137
.docker_build:
138-
image: ${REGISTRY_DOCKER_URL}/docker:20
138+
image: ${REGISTRY_DOCKER_URL}/library/docker:20
139139
services:
140-
- name: ${REGISTRY_DOCKER_URL}/docker:20-dind
140+
- name: ${REGISTRY_DOCKER_URL}/library/docker:20-dind
141141
alias: docker
142142
variables:
143143
DOCKER_DRIVER: overlay

.gitlab-ci-docker.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ services:
88
command:
99
- --experimental
1010
- --tls=false
11-
name: ${REGISTRY_DOCKER_URL}/docker:20-dind
11+
name: ${REGISTRY_DOCKER_URL}/library/docker:20-dind
1212

1313
stages:
1414
- merge-manifest
1515
- acceptance
1616

1717
merge-manifest:
1818
stage: merge-manifest
19-
image: ${REGISTRY_DOCKER_URL}/docker:20-git
19+
image: ${REGISTRY_DOCKER_URL}/library/docker:20-git
2020
script:
2121
- echo "${quay_password}" | docker login --username=${quay_user} --password-stdin quay.io
2222
- docker manifest create "${DST_REPOSITORY}:${DST_TAG}" --amend "${DST_REPOSITORY}:${DST_TAG}-amd64" --amend "${DST_REPOSITORY}:${DST_TAG}-arm64"
23-
- docker manifest push "${DST_REPOSITORY}:${DST_TAG}"
23+
- docker manifest push "${DST_REPOSITORY}:${DST_TAG}"

.gitlab-ci-x64.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ publish_binaries:
135135
- cd $CI_PROJECT_DIR/packaging && ./publish_staging_package.sh
136136

137137
.docker_build:
138-
image: ${REGISTRY_DOCKER_URL}/docker:20
138+
image: ${REGISTRY_DOCKER_URL}/library/docker:20
139139
services:
140-
- name: ${REGISTRY_DOCKER_URL}/docker:20-dind
140+
- name: ${REGISTRY_DOCKER_URL}/library/docker:20-dind
141141
alias: docker
142142
variables:
143143
DOCKER_DRIVER: overlay

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@ notify-on-master-fail:
8787
# QUAY_IMAGE: the full URL of the destination image on Quay `(e.g. quay.io/stackstate/stackstate-k8s-process-agent:latest-amd64)`
8888
push_image_to_quay:
8989
stage: postbuild
90-
image: ${REGISTRY_DOCKER_URL}/docker:20
90+
image: ${REGISTRY_DOCKER_URL}/library/docker:20
9191
services:
9292
- alias: docker
9393
command:
9494
- --experimental
9595
- --tls=false
96-
name: ${REGISTRY_DOCKER_URL}/docker:20-dind
96+
name: ${REGISTRY_DOCKER_URL}/library/docker:20-dind
9797
variables:
9898
# We cannot access the host docker socket in GitLab CI, so we need to use the Docker-in-Docker service
9999
DOCKER_DRIVER: overlay2

.idea/sbt.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)