From cccbd220a98587cd75e1cd617afc5470b649f012 Mon Sep 17 00:00:00 2001
From: "Heijden,T.A.J. van der (Thijs)" <t.a.j.vanderheijden@uu.nl>
Date: Sun, 29 Jan 2023 10:46:19 +0000
Subject: [PATCH] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ab8109ae..cbc68207e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,12 +68,12 @@ build-docker:
only:
- main
script:
- - docker build --progress plain -t datastropheregistry.azurecr.io/frontend:latest:latest .
- # after_script:
- # - docker login datastropheregistry.azurecr.io -u $REGISTRY_USERNAME -p $REGISTRY_PASSWORD
- # - if [[ ! -z $CI_COMMIT_BRANCH+x ]]; then DOCKER_TAG=$CI_COMMIT_BRANCH; else DOCKER_TAG=$CI_MERGE_REQUEST_TARGET_BRANCH_NAME; fi
- # - docker tag $CI_PROJECT_NAME-webserver-service datastropheregistry.azurecr.io/$CI_PROJECT_NAME-webserver-service:$DOCKER_TAG
- # - docker push datastropheregistry.azurecr.io/$CI_PROJECT_NAME-webserver-service:$DOCKER_TAG
+ - docker build --progress plain -t $REGISTRY_URL/frontend:latest .
+ after_script:
+ - docker login $REGISTRY_URL -u $REGISTRY_USERNAME -p $REGISTRY_PASSWORD
+ - if [[ ! -z $CI_COMMIT_BRANCH+x ]]; then DOCKER_TAG=$CI_COMMIT_BRANCH; else DOCKER_TAG=$CI_MERGE_REQUEST_TARGET_BRANCH_NAME; fi
+ - docker tag $REGISTRY_URL/frontend:latest $REGISTRY_URL/frontend:$DOCKER_TAG
+ - docker push $REGISTRY_URL/frontend:$DOCKER_TAG
dependencies:
- build
--
GitLab