Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devops/repair-dind' into 'dev'

Browse Source 
Use best practice with dind-TLS

See merge request crafty-controller/crafty-commander!118
This commit is contained in:
Iain Powrie 2021-12-21 01:43:51 +00:00
commit abdcf29c1d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab-ci.yml
View File

@ -4,11 +4,14 @@ stages:
- docker-dev
- docker-prod
variables:
DOCKER_HOST: tcp://docker:2376
DOCKER_TLS_CERTDIR: "/certs"
docker-build-dev:
image: docker:latest
services:
- name: docker:dind
command: ["--experimental"]
stage: docker-dev
tags:
- docker
@ -32,7 +35,8 @@ docker-build-dev:
- |
tag=":$CI_COMMIT_REF_SLUG"
echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
- docker buildx create --use --name zedBuilder
- docker context create tls-environment
- docker buildx create --name zedBuilder --use tls-environment
- docker buildx build
--cache-from type=registry,ref="$CI_REGISTRY_IMAGE${tag}"
--build-arg BUILDKIT_INLINE_CACHE=1
@ -42,6 +46,7 @@ docker-build-dev:
after_script:
- |
docker buildx rm zedBuilder && echo "Successfully Stopped builder instance" || echo "Failed to stop builder instance."
docker context rm tls-environment || true
echo "Please review multi-arch manifests are present:"
docker buildx imagetools inspect "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
@ -49,7 +54,6 @@ docker-build-prod:
image: docker:latest
services:
- name: docker:dind
command: ["--experimental"]
stage: docker-prod
tags:
- docker
@ -73,7 +77,8 @@ docker-build-prod:
- |
tag=""
echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
- docker buildx create --use --name zedBuilder
- docker context create tls-environment
- docker buildx create --name zedBuilder --use tls-environment
- docker buildx build
--cache-from type=registry,ref="$CI_REGISTRY_IMAGE${tag}"
--build-arg BUILDKIT_INLINE_CACHE=1
@ -83,6 +88,7 @@ docker-build-prod:
after_script:
- |
docker buildx rm zedBuilder && echo "Successfully Stopped builder instance" || echo "Failed to stop builder instance."
docker context rm tls-environment || true
echo "Please review multi-arch manifests are present:"
docker buildx imagetools inspect "$CI_REGISTRY_IMAGE${tag}"