Merge branch 'acceptance' into 'master'

modified CI/CD pipeline for 'acceptance'

See merge request !3

.gitlab-ci.yml

@@ -15,6 +15,7 @@ docker-build-master:
     - docker push "$CI_REGISTRY_IMAGE"
   only:
     - master
+    - acceptance
 
 docker-build-branch:
   # Official docker image.
@@ -50,3 +51,21 @@ docker-deploy-master:
   when: manual
   only:
     - master
+
+docker-deploy-acceptance:
+  image: docker:latest
+  stage: deploy
+  before_script:
+    - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )'
+    - eval $(ssh-agent -s)
+    - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
+    - mkdir -p ~/.ssh
+    - chmod 700 ~/.ssh
+    - ssh-keyscan dop457.astron.nl >> ~/.ssh/known_hosts
+    - chmod 644 ~/.ssh/known_hosts
+  script:
+    - ssh -o StrictHostKeyChecking=no vermaas@dop457.astron.nl "docker pull "$CI_REGISTRY_IMAGE""
+    - ssh -o StrictHostKeyChecking=no vermaas@dop457.astron.nl "docker-compose -p atdb -f /data/docker_compose/docker-compose-atdb-ldv-acc-cd.yml up -d"
+  when: manual
+  only:
+    - acceptance
\ No newline at end of file

atdb/docker-compose-atdb-ldv-acc-cd.yml

+version: '3.4'
+networks:
+  atdb_network:
+  default:
+    driver: bridge
+
+services:
+  atdb-ldv-db:
+    container_name: atdb-ldv-postgres
+    image: atdb-ldv-postgres:latest
+    #image: "postgres"
+    expose:
+      - 5432
+    networks:
+      - atdb_network
+    volumes:
+    - $HOME/shared:/shared
+    restart: always
+
+  atdb-backend:
+    container_name: atdb-ldv
+    image: git.astron.nl:5000/astron-sdc/atdb-ldv:latest
+    ports:
+      - "5554:8000"
+    expose:
+      - "8000"
+    networks:
+      - atdb_network
+
+    depends_on:
+      - atdb-ldv-db
+    restart: always

atdb/docker-compose-atdb-ldv-acc.yml

+version: '3.4'
+networks:
+  atdb_network:
+
+  default:
+    driver: bridge
+
+services:
+  atdb-ldv-db:
+    container_name: atdb-ldv-postgres
+    image: atdb-ldv-postgres:latest
+#    build:
+#       context: ./docker/postgres
+#       dockerfile: Dockerfile
+#    ports:
+#    - "5433:5432"
+    expose:
+      - 5432
+    networks:
+      - atdb_network
+    volumes:
+    - /data/shared:/shared
+    restart: always
+
+  atdb-backend:
+    container_name: atdb-ldv
+    image: atdb-ldv:latest
+    ports:
+      - "5554:8000"
+    expose:
+      - "8000"
+    networks:
+      - atdb_network
+
+    depends_on:
+      - atdb-ldv-db
+    restart: always

atdb/taskdatabase/templates/taskdatabase/index.html

@@ -44,7 +44,7 @@
     </div>
     {% include 'taskdatabase/pagination.html' %}
 </div>
-    <p class="footer"> Version 1.0.0 (4 feb 2021 - 12:00)
+    <p class="footer"> Version 1.0.0 (5 feb 2021 - 15:00)
     <script type="text/javascript">
         (function(seconds) {
             var refresh,