diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eb0cc35fb6fced1686ad3397d5d8015a2b48c42d..0c18997ed9a824e3188be4f4406f60af63f2695d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -167,10 +167,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}} @@ -207,7 +206,6 @@ dind-deploy: rules: - when: manual variables: - BUILD_IMAGE: dind EXPORT_TAG: master base: