From 576a5ccbe9e211ad0d4ed1bc2d8cdd080bdbec4e Mon Sep 17 00:00:00 2001
From: vermaas <vermaas@astron.nl>
Date: Thu, 20 Oct 2022 12:36:35 +0200
Subject: [PATCH] make it a bit simpler, remove slug
---
.gitlab-ci.yml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b694bf1b..d1dc728e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
- deploy_to_test
- deploy_to_production
-docker-build-master:
+docker-build:
# Official docker image.
image: docker:latest
stage: build
@@ -15,9 +15,9 @@ docker-build-master:
script:
- docker build --pull -t "$CI_REGISTRY_IMAGE" atdb
- docker push "$CI_REGISTRY_IMAGE"
- only:
- - master
- - release
+# only:
+# - master
+# - release
docker-build-branch:
# Official docker image.
@@ -28,8 +28,8 @@ docker-build-branch:
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
- - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" atdb
- - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+ - docker build --pull -t "$CI_REGISTRY_IMAGE" atdb
+ - docker push "$CI_REGISTRY_IMAGE"
except:
- master
- release
@@ -86,7 +86,7 @@ docker-deploy-branch-to-test:
- ssh-keyscan dop814.astron.nl >> ~/.ssh/known_hosts
- chmod 644 ~/.ssh/known_hosts
script:
- - ssh -o StrictHostKeyChecking=no vermaas@dop814.astron.nl "docker pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG""
+ - ssh -o StrictHostKeyChecking=no vermaas@dop814.astron.nl "docker pull "$CI_REGISTRY_IMAGE""
- ssh -o StrictHostKeyChecking=no vermaas@dop814.astron.nl "docker-compose -p atdb -f /docker_compose/atdb-ldv/docker-compose-dev-cd.yml up -d"
when: manual
except:
--
GitLab