Skip to content
Snippets Groups Projects

feat: manual dind default to master

Closed Wouter Deconinck requested to merge master-patch-0307 into master
+ 31
29
@@ -162,6 +162,22 @@ version:
@@ -162,6 +162,22 @@ version:
when: on_success
when: on_success
- when: never
- when: never
 
.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
@@ -174,39 +190,25 @@ version:
@@ -174,39 +190,25 @@ version:
## Docker-in-docker image
## Docker-in-docker image
dind-build:
dind-build:
parallel:
extends: .dind
matrix:
- BUILD_IMAGE: dind
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-confirm:
image: ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}
image: ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}
parallel:
extends: .dind
matrix:
- BUILD_IMAGE: dind
extends: .build
stage: dind
needs:
needs:
- version
- dind-build
- dind-build
script:
rules:
- docker buildx build --push
- when: manual
--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}
${EXPORT_TAG:+
dind-deploy:
${CI_PUSH:+--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${EXPORT_TAG}}
image: ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${EXPORT_TAG}
${DH_PUSH:+--tag ${DH_REGISTRY}/${DH_REGISTRY_USER}/${BUILD_IMAGE}:${EXPORT_TAG}}
extends: .dind
${GH_PUSH:+--tag ${GH_REGISTRY}/${GH_REGISTRY_USER}/${BUILD_IMAGE}:${EXPORT_TAG}}
needs:
}
- dind-confirm
--file containers/dind/Dockerfile
rules:
containers/dind
- when: manual
 
variables:
 
EXPORT_TAG: master
base:
base:
parallel:
parallel:
Loading