From ac78a14c711710c67eac0a264c5195eb465360ef Mon Sep 17 00:00:00 2001
From: vermaas <vermaas@astron.nl>
Date: Mon, 5 Dec 2022 15:28:44 +0100
Subject: [PATCH] reverting changes to CI/CD pipeline, see if that deploys
again
---
.gitlab-ci.yml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6906fb7..f371384 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,7 @@ docker-test-build:
- docker push $CI_REGISTRY_IMAGE$DOCKER_IMAGE_TAG
-docker-build-main:
+docker-build-master:
# Official docker image.
image: docker$DOCKER_BUILD_IMAGE_TAG
stage: build
@@ -82,7 +82,8 @@ docker-deploy-main-test:
- ssh -o StrictHostKeyChecking=no sdc@dop814.astron.nl "docker-compose -p adex-backend -f /docker_compose/adex-backend-fastapi/docker-compose-dev-cd.yml up -d"
- echo "Application deployed"
when: manual
-
+ only:
+ - main
docker-deploy-main-production:
# image: docker:latest
@@ -121,5 +122,6 @@ docker-deploy-main-production:
- ssh -o StrictHostKeyChecking=no sdco@dop821.astron.nl "docker-compose -p adex-backend -f /opt/dockercompose/adex-backend-fastapi/docker-compose-production-cd.yml up -d"
- echo "Application deployed"
when: manual
-
+ only:
+ - main
--
GitLab