From 9f227b793f08b7b7dffb8ec93cd5cc4ae7bdb3b1 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sun, 2 Jul 2023 22:09:36 +0000
Subject: [PATCH] feat: manual dind default to master
---
.gitlab-ci.yml | 61 +++++++++++++++++++++++++-------------------------
1 file changed, 30 insertions(+), 31 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ee002528..3073de8d8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -146,6 +146,22 @@ version:
done
- 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:
## debian_testing_base --> jug_dev --> jug_xl
## ---------------> jug_sim
@@ -158,39 +174,22 @@ version:
## Docker-in-docker image
dind-build:
- parallel:
- 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
+ extends: .dind
+ variables:
+ - EXPORT_TAG:
dind-publish:
- image: ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}
- parallel:
- matrix:
- - BUILD_IMAGE: dind
- extends: .build
- stage: dind
- needs:
- - version
- - dind-build
- 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
+ image: ${CI_REGISTRY}/${CI_PROJECT_PATH}/dind:${INTERNAL_TAG}
+ extends: .dind
+ variables:
+ - EXPORT_TAG: ${EXPORT_TAG}
+
+dind-default:
+ image: ${CI_REGISTRY}/${CI_PROJECT_PATH}/dind:${INTERNAL_TAG}
+ extends: .dind
+ when: manual
+ variables:
+ - EXPORT_TAG: master
base:
parallel:
--
GitLab