From e847c828a79968f5fe87021d13bdcd2f924f2da5 Mon Sep 17 00:00:00 2001
From: vermaas <vermaas@astron.nl>
Date: Fri, 23 Dec 2022 08:21:29 +0100
Subject: [PATCH] enable shared runners and switch to 'sdc-dev' tag
---
.gitlab-ci.yml | 14 +++++++++-----
.../taskdatabase/templates/taskdatabase/index.html | 2 +-
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d90caeb5..d04f13ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,10 +18,12 @@ docker-build:
# - master
-# deploy master or branch to 'sdc-dev.astron.nl'
+# deploy to 'sdc-dev.astron.nl'
docker-deploy-to-test:
image: docker:latest
stage: deploy_to_test
+ tags:
+ - "sdc-dev"
before_script:
- 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )'
- eval $(ssh-agent -s)
@@ -39,10 +41,12 @@ docker-deploy-to-test:
# only:
# - master
-# deploy master branch to 'sdc.astron.nl'
-docker-deploy-master-to-production:
+# deploy to 'sdc.astron.nl'
+docker-deploy-to-production:
image: docker:latest
stage: deploy_to_production
+ tags:
+ - "sdc-dev"
before_script:
- 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )'
- eval $(ssh-agent -s)
@@ -56,5 +60,5 @@ docker-deploy-master-to-production:
- ssh -o StrictHostKeyChecking=no sdco@dop821.astron.nl "docker pull "$CI_REGISTRY_IMAGE""
- ssh -o StrictHostKeyChecking=no sdco@dop821.astron.nl "docker-compose -p atdb -f /opt/dockercompose/atdb-ldv-compose/docker-compose-production-cd.yml up -d"
when: manual
- only:
- - master
\ No newline at end of file
+# only:
+# - master
\ No newline at end of file
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index 9c6aea8c..47e4181d 100644
--- a/atdb/taskdatabase/templates/taskdatabase/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/index.html
@@ -34,7 +34,7 @@
{% include 'taskdatabase/pagination.html' %}
</div>
</div>
- <p class="footer"> Version 22 December 2022 - 12:00
+ <p class="footer"> Version 23 December 2022 - 8:00
</div>
--
GitLab