Merge branch 'fix/docker-build-issues' into 'main'
Fix Docker-in-Docker connectivity for GitLab CI See merge request digiresilience/link/link-stack!23
This commit is contained in:
commit
69cb77b8f4
1 changed files with 8 additions and 2 deletions
|
|
@ -20,11 +20,13 @@ build-all:
|
|||
- turbo build
|
||||
|
||||
.docker-build:
|
||||
image: registry.gitlab.com/digiresilience/link/link-stack/buildx:${CI_COMMIT_REF_NAME}
|
||||
image: registry.gitlab.com/digiresilience/link/link-stack/buildx:main
|
||||
services:
|
||||
- docker:dind
|
||||
stage: docker-build
|
||||
variables:
|
||||
DOCKER_HOST: tcp://docker:2375
|
||||
DOCKER_TLS_CERTDIR: ""
|
||||
DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
|
||||
BUILD_CONTEXT: .
|
||||
only:
|
||||
|
|
@ -37,11 +39,13 @@ build-all:
|
|||
- docker push ${DOCKER_NS}:${DOCKER_TAG}
|
||||
|
||||
.docker-release:
|
||||
image: registry.gitlab.com/digiresilience/link/link-stack/buildx:${CI_COMMIT_REF_NAME}
|
||||
image: registry.gitlab.com/digiresilience/link/link-stack/buildx:main
|
||||
services:
|
||||
- docker:dind
|
||||
stage: docker-release
|
||||
variables:
|
||||
DOCKER_HOST: tcp://docker:2375
|
||||
DOCKER_TLS_CERTDIR: ""
|
||||
DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
|
||||
DOCKER_TAG_NEW: ${CI_COMMIT_REF_NAME}
|
||||
only:
|
||||
|
|
@ -195,6 +199,7 @@ zammad-docker-build:
|
|||
PNPM_HOME: "/pnpm"
|
||||
before_script:
|
||||
- export PATH="$PNPM_HOME:$PATH"
|
||||
- corepack enable && corepack prepare pnpm@9.15.4 --activate
|
||||
script:
|
||||
- pnpm add -g turbo
|
||||
- pnpm install --frozen-lockfile
|
||||
|
|
@ -217,6 +222,7 @@ zammad-standalone-docker-build:
|
|||
PNPM_HOME: "/pnpm"
|
||||
before_script:
|
||||
- export PATH="$PNPM_HOME:$PATH"
|
||||
- corepack enable && corepack prepare pnpm@9.15.4 --activate
|
||||
script:
|
||||
- pnpm add -g turbo
|
||||
- pnpm install --frozen-lockfile
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue