Merge pull request 'Vps update' (#11) from Vps-new-infrastructure into main

Reviewed-on: #11

dev-docker-compose.yml

@@ -1,52 +0,0 @@
-version: "3.8"
-services:
-  xpensely-server:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    image: xpensely-server:local
-    labels:
-      net.unraid.docker.icon: https://tea.zendric.de/Cedric/XpenselyServer/raw/branch/main/src/main/resources/static/xpensely_icon_white.png
-    container_name: xpensely-server
-    ports:
-      - 3636:8080
-    environment:
-      GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID}
-      GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET}
-      DB_PORT: 5432
-      DB_P_NAME: xpensely
-      DB_USERNAME: ${DB_USERNAME}
-      DB_PASSWORD: ${DB_PASSWORD}
-      SPRING_PROFILES_ACTIVE: test
-    depends_on:
-      postgresdb:
-        condition: service_healthy
-    networks:
-      - xpensely-network
-  postgresdb:
-    labels:
-      net.unraid.docker.icon: https://raw.githubusercontent.com/docker-library/docs/01c12653951b2fe592c1f93a13b4e289ada0e3a1/postgres/logo.png
-    image: postgres:14
-    container_name: postgresdb
-    ports:
-      - 5435:5432
-    environment:
-      POSTGRES_DB: xpensely
-      POSTGRES_USER: ${DB_USERNAME}
-      POSTGRES_PASSWORD: ${DB_PASSWORD}
-    networks:
-      - xpensely-network
-    volumes:
-      - db_data:/var/lib/postgresql/data
-    restart: unless-stopped
-    healthcheck:
-      test:
-        - CMD-SHELL
-        - pg_isready -U ${DB_USERNAME} -d xpensely
-      interval: 10s
-      timeout: 5s
-      retries: 5
-volumes:
-  db_data: null
-networks:
-  xpensely-network: null

docker-compose.yml

@@ -1,48 +1,48 @@
 version: "3.8"
+
 services:
   xpensely-server:
-    image: tea.zendric.de/cedric/xpensely-server:0
-    labels:
-      net.unraid.docker.icon: https://tea.zendric.de/Cedric/XpenselyServer/raw/branch/main/src/main/resources/static/xpensely_icon_white.png
-    container_name: xpensely-server
-    ports:
-      - 3636:8080
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: xpensely-server
+    restart: always
     environment:
       GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID}
       GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET}
+
       DB_PORT: 5432
-      DB_P_NAME: xpensely
-      DB_USERNAME: ${DB_USERNAME}
-      DB_PASSWORD: ${DB_PASSWORD}
+      DB_P_NAME: ${POSTGRES_DB}
+      DB_USERNAME: ${POSTGRES_USER}
+      DB_PASSWORD: ${POSTGRES_PASSWORD}
+
+      SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE}
     depends_on:
       postgresdb:
         condition: service_healthy
     networks:
       - xpensely-network
+
   postgresdb:
-    labels:
-      net.unraid.docker.icon: https://raw.githubusercontent.com/docker-library/docs/01c12653951b2fe592c1f93a13b4e289ada0e3a1/postgres/logo.png
     image: postgres:14
-    container_name: postgresdb
-    ports:
-      - 5435:5432
+    restart: unless-stopped
     environment:
-      POSTGRES_DB: xpensely
-      POSTGRES_USER: ${DB_USERNAME}
-      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
     networks:
       - xpensely-network
-    volumes:
-      - db_data:/var/lib/postgresql/data
-    restart: unless-stopped
     healthcheck:
-      test:
-        - CMD-SHELL
-        - pg_isready -U ${DB_USERNAME} -d xpensely
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
       interval: 10s
       timeout: 5s
       retries: 5
+
 volumes:
-  db_data: null
+  postgres_data:
+
 networks:
-  xpensely-network: null
+  xpensely-network:
+    driver: bridge