From ce80c5f46c3db6ded3c42d7b3974090b64f05f10 Mon Sep 17 00:00:00 2001 From: Manuel Kieweg <manuel.kieweg@h-da.de> Date: Fri, 26 Mar 2021 19:33:57 +0000 Subject: [PATCH] clear before_script for docker building stages --- build/ci/.build-container.yml | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/build/ci/.build-container.yml b/build/ci/.build-container.yml index 7cf8ec51b..1c651431f 100644 --- a/build/ci/.build-container.yml +++ b/build/ci/.build-container.yml @@ -6,33 +6,19 @@ variables: DOCKER_TLS_CERTDIR: "/certs" DOCKER_IMAGE_SHA: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA -build:docker: +.deploy: &deploy before_script: - echo "override global before script" image: docker:19.03.12 + stage: build tags: - dind - stage: build - rules: - - if: $CI_COMMIT_BRANCH == "develop" - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - - if: $CI_PIPELINE_SOURCE == "merge_request_event" script: - > docker build \ --build-arg GITLAB_USER=$GO_MODULES_USER \ --build-arg GITLAB_TOKEN=$GO_MODULES_ACCESS_TOKEN \ -t $DOCKER_IMAGE_SHA . - -.deploy: &deploy - before_script: - - echo "override global before script" - image: docker:19.03.12 - stage: deploy - needs: ["build:docker"] - tags: - - dind - script: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker tag $DOCKER_IMAGE_SHA $TAG - docker push $TAG @@ -58,11 +44,15 @@ deploy:latest: before_script: - echo "override global before script" image: docker:19.03.12 - stage: deploy - needs: ["build:docker"] + stage: build tags: - dind script: + - > + docker build \ + --build-arg GITLAB_USER=$GO_MODULES_USER \ + --build-arg GITLAB_TOKEN=$GO_MODULES_ACCESS_TOKEN \ + -t $DOCKER_IMAGE_SHA . - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker tag $DOCKER_IMAGE_SHA $TAG - docker push $TAG -- GitLab