diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d90caeb557eba5deccfe625fc63abe650f9f22c3..d04f13ac1ffd21d162ad5d8d83eb96a808cd7602 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 9c6aea8c0ef1ea4ea9d6bb9e4ca8296c0d07aa8b..47e4181d7741fa944d14aefffec72b103fe79f05 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>