Skip to content
Snippets Groups Projects
Commit 9f227b79 authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

feat: manual dind default to master

parent d5aab525
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !632. Comments created here will be created in the context of that merge request.
...@@ -146,6 +146,22 @@ version: ...@@ -146,6 +146,22 @@ version:
done done
- docker buildx create --name builder --driver docker-container --bootstrap --use - docker buildx create --name builder --driver docker-container --bootstrap --use
.dind:
stage: dind
extends: .build
variables:
- BUILD_IMAGE: dind
script:
- docker buildx build --push
--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}
${EXPORT_TAG:+
${CI_PUSH:+--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${EXPORT_TAG}}
${DH_PUSH:+--tag ${DH_REGISTRY}/${DH_REGISTRY_USER}/${BUILD_IMAGE}:${EXPORT_TAG}}
${GH_PUSH:+--tag ${GH_REGISTRY}/${GH_REGISTRY_USER}/${BUILD_IMAGE}:${EXPORT_TAG}}
}
--file containers/dind/Dockerfile
containers/dind
## Images: ## Images:
## debian_testing_base --> jug_dev --> jug_xl ## debian_testing_base --> jug_dev --> jug_xl
## ---------------> jug_sim ## ---------------> jug_sim
...@@ -158,39 +174,22 @@ version: ...@@ -158,39 +174,22 @@ version:
## Docker-in-docker image ## Docker-in-docker image
dind-build: dind-build:
parallel: extends: .dind
matrix: variables:
- BUILD_IMAGE: dind - EXPORT_TAG:
extends: .build
stage: dind
needs:
- version
script:
- docker buildx build --push
--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}
--file containers/dind/Dockerfile
containers/dind
dind-publish: dind-publish:
image: ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG} image: ${CI_REGISTRY}/${CI_PROJECT_PATH}/dind:${INTERNAL_TAG}
parallel: extends: .dind
matrix: variables:
- BUILD_IMAGE: dind - EXPORT_TAG: ${EXPORT_TAG}
extends: .build
stage: dind dind-default:
needs: image: ${CI_REGISTRY}/${CI_PROJECT_PATH}/dind:${INTERNAL_TAG}
- version extends: .dind
- dind-build when: manual
script: variables:
- docker buildx build --push - EXPORT_TAG: master
--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}
${EXPORT_TAG:+
${CI_PUSH:+--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${EXPORT_TAG}}
${DH_PUSH:+--tag ${DH_REGISTRY}/${DH_REGISTRY_USER}/${BUILD_IMAGE}:${EXPORT_TAG}}
${GH_PUSH:+--tag ${GH_REGISTRY}/${GH_REGISTRY_USER}/${BUILD_IMAGE}:${EXPORT_TAG}}
}
--file containers/dind/Dockerfile
containers/dind
base: base:
parallel: parallel:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment