Merge branch 'SDC-516-database-move-cleanup' into 'master'

compose file is deployed from ci/cd pipeline

See merge request !267

.gitlab-ci.yml

@@ -31,6 +31,7 @@ docker-deploy-to-test:
     - ssh-keyscan dop814.astron.nl >> ~/.ssh/known_hosts
     - chmod 644 ~/.ssh/known_hosts
   script:
+    - scp -O -o StrictHostKeyChecking=no atdb/docker/docker-compose-dev-cd.yml sdc@dop814.astron.nl:/docker_compose/atdb-ldv/docker-compose-dev-cd.yml
     - ssh -o StrictHostKeyChecking=no sdc@dop814.astron.nl "echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY"
     - ssh -o StrictHostKeyChecking=no sdc@dop814.astron.nl "docker pull "$CI_REGISTRY_IMAGE""
     - ssh -o StrictHostKeyChecking=no sdc@dop814.astron.nl "docker-compose -p atdb -f /docker_compose/atdb-ldv/docker-compose-dev-cd.yml up -d"

atdb/docker/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
-    env_file:
-      - /data/shared/atdb_ldv.env
-    restart: always

atdb/docker/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
-    env_file:
-      - /data/shared/atdb_ldv.env
-    restart: always

atdb/docker/docker-compose-dev-cd.yml

@@ -8,28 +8,29 @@ networks:
     driver: bridge
 
 services:
-  atdb-ldv-db:
-    container_name: atdb-ldv-postgres
-    image: atdb-ldv-postgres:latest
+#  atdb-ldv-db:
+#    container_name: atdb-ldv-postgres
+#    image: atdb-ldv-postgres:latest
     #image: "postgres"
-    expose:
-      - 5432
-    networks:
-      - traefik_proxy
-      - atdb_network
-    volumes:
-    - $HOME/shared:/shared
-    restart: always
+#    expose:
+#      - 5432
+#    networks:
+#      - traefik_proxy
+#      - atdb_network
+#    volumes:
+#    - $HOME/shared:/shared
+#    restart: always
 
   atdb-backend:
     container_name: atdb-ldv
     image: git.astron.nl:5000/astron-sdc/atdb-ldv:latest
-
     expose:
       - "8000"
     networks:
       - traefik_proxy
       - atdb_network
+    env_file:
+      - $HOME/shared/atdb_ldv.env
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.atdb-backend.entryPoints=atdb-ldv"
@@ -37,8 +38,22 @@ services:
       - "traefik.http.routers.atdb-backend.rule=Host(`sdc-dev.astron.nl`) && PathPrefix(`/atdb`)"
       - "traefik.http.services.atdb-backend.loadbalancer.server.port=8000"
 
-    depends_on:
-      - atdb-ldv-db
+  atdb-ldv-db:
+    image: postgres:14
+    container_name: atdb-ldv-postgres14
+    expose:
+      - "5432"
+    ports:
+      # enables an external database connection to sdc-dev.astron.nl:10000 (handy for pgadmin)
+      - "10000:5432"
+    networks:
+      - traefik_proxy
+      - atdb_network
     env_file:
-    - $HOME/shared/atdb_ldv.env
+      - $HOME/shared/atdb_ldv.env
+    volumes:
+      - atdb-ldv-database:/var/lib/postgresql/data
     restart: always
+
+volumes:
+  atdb-ldv-database:
\ No newline at end of file

atdb/docker/docker-compose-dev.yml

-version: '3.4'
-networks:
-  atdb_network:
-  traefik_proxy:
-    external:
-      name: traefik_proxy
-  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:
-      - traefik_proxy
-      - atdb_network
-    volumes:
-    - $HOME/shared:/shared
-    restart: always
-
-  atdb-backend:
-    container_name: atdb-ldv
-    image: atdb-ldv:latest
-    expose:
-      - "8000"
-    networks:
-      - traefik_proxy
-      - atdb_network
-    labels:
-      # https://www.digitalocean.com/community/tutorials/how-to-use-traefik-as-a-reverse-proxy-for-docker-containers-on-ubuntu-18-04
-      - "traefik.enable=true"
-      - "traefik.http.routers.atdb-backend.entryPoints=atdb-ldv"
-      - "traefik.http.routers.atdb-backend.service=atdb-backend"
-      - "traefik.http.routers.atdb-backend.rule=Host(`sdc-dev.astron.nl`) && PathPrefix(`/atdb`)"
-      - "traefik.http.services.atdb-backend.loadbalancer.server.port=8000"
-    depends_on:
-      - atdb-ldv-db
-    env_file:
-      - $HOME/shared/atdb_ldv.env
-    restart: always

atdb/docker/docker-compose-production.yml

-version: '3.4'
-networks:
-  atdb_network:
-  traefik_proxy:
-    external:
-      name: traefik_proxy
-  default:
-    driver: bridge
-
-services:
-  atdb-backend:
-    container_name: atdb-ldv
-    image: atdb-ldv:latest
-    expose:
-      - "8000"
-    networks:
-      - traefik_proxy
-      - atdb_network
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.atdb-backend.entryPoints=atdb-ldv"
-      - "traefik.http.routers.atdb-backend.service=atdb-backend"
-      - "traefik.http.routers.atdb-backend.rule=Host(`sdc.astron.nl`) && PathPrefix(`/atdb`)"
-      - "traefik.http.services.atdb-backend.loadbalancer.server.port=8000"
-    env_file:
-      - $HOME/shared/atdb_ldv.env
-    restart: always

atdb/taskdatabase/templates/taskdatabase/index.html

@@ -34,7 +34,7 @@
         {% include 'taskdatabase/pagination.html' %}
        </div>
     </div>
-    <p class="footer"> Version 2 December 2022
+    <p class="footer"> Version 2 December 2022 - 13:00
 
 </div>