Merge branch 'fix-dind-confusion' into 'dev'
fix(ci): point DinD at the docker service alias, not localhost See merge request gitlab-instance-b9b5cf2f/vncmail-plus!12
This commit is contained in:
+7
-2
@@ -40,7 +40,11 @@ variables:
|
|||||||
IMAGE: $CI_REGISTRY_IMAGE
|
IMAGE: $CI_REGISTRY_IMAGE
|
||||||
GIT_STRATEGY: clone
|
GIT_STRATEGY: clone
|
||||||
DOCKER_DRIVER: overlay2
|
DOCKER_DRIVER: overlay2
|
||||||
DOCKER_HOST: tcp://localhost:2375
|
# DinD service is reached at the `docker` alias (set explicitly on the
|
||||||
|
# service below), not localhost. TLS disabled so the daemon listens on
|
||||||
|
# plaintext 2375 — same pattern as the working vnc-localidp pipeline.
|
||||||
|
DOCKER_HOST: tcp://docker:2375
|
||||||
|
DOCKER_TLS_CERTDIR: ""
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# verify — required check on every MR into dev. No registry, no cluster.
|
# verify — required check on every MR into dev. No registry, no cluster.
|
||||||
@@ -69,7 +73,8 @@ build:
|
|||||||
stage: build
|
stage: build
|
||||||
image: docker:28.4.0
|
image: docker:28.4.0
|
||||||
services:
|
services:
|
||||||
- docker:28.4.0-dind
|
- name: docker:28.4.0-dind
|
||||||
|
alias: docker
|
||||||
rules:
|
rules:
|
||||||
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "dev"'
|
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "dev"'
|
||||||
before_script:
|
before_script:
|
||||||
|
|||||||
Reference in New Issue
Block a user