diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8acc9629e7a710069dff3b4319ab5ef2323bdd9d..87f185c1d484b4c54f6faed23276ebd06c75ca37 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -152,10 +152,9 @@ version: extends: .build variables: BUILD_IMAGE: dind - EXPORT_TAG: ${CI_COMMIT_REF_NAME} script: - docker buildx build --push - --tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${CI_COMMIT_REF_NAME} + --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}} @@ -201,7 +200,6 @@ dind-deploy: rules: - when: manual variables: - BUILD_IMAGE: dind EXPORT_TAG: master base: