rc #2

Merged
Cedric merged 4 commits from dev into main 2025-01-12 14:18:03 +01:00
Showing only changes of commit 31566d1bd8 - Show all commits

View File

@@ -1,15 +1,17 @@
version: "3.8" version: "3.8"
services: services:
xpensely-server: xpensely-server:
image: tea.zendric.de/cedric/xpensely-server:latest 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 container_name: xpensely-server
ports: ports:
- 3636:8080 - 3636:8080
environment: environment:
GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID} GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID}
GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET} GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET}
DB_PORT: 5434 DB_PORT: 5432
DB_NAME: ${DB_P_NAME} DB_P_NAME: xpensely
DB_USERNAME: ${DB_USERNAME} DB_USERNAME: ${DB_USERNAME}
DB_PASSWORD: ${DB_PASSWORD} DB_PASSWORD: ${DB_PASSWORD}
depends_on: depends_on:
@@ -18,12 +20,14 @@ services:
networks: networks:
- xpensely-network - xpensely-network
postgresdb: postgresdb:
labels:
net.unraid.docker.icon: https://raw.githubusercontent.com/docker-library/docs/01c12653951b2fe592c1f93a13b4e289ada0e3a1/postgres/logo.png
image: postgres:14 image: postgres:14
container_name: postgresdb container_name: postgresdb
ports: ports:
- 5434:5432 - 5432:5432
environment: environment:
POSTGRES_DB: ${DB_P_NAME} POSTGRES_DB: xpensely
POSTGRES_USER: ${DB_USERNAME} POSTGRES_USER: ${DB_USERNAME}
POSTGRES_PASSWORD: ${DB_PASSWORD} POSTGRES_PASSWORD: ${DB_PASSWORD}
networks: networks:
@@ -32,7 +36,9 @@ services:
- db_data:/var/lib/postgresql/data - db_data:/var/lib/postgresql/data
restart: unless-stopped restart: unless-stopped
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U ${DB_USERNAME}"] test:
- CMD-SHELL
- pg_isready -U ${DB_USERNAME} -d xpensely
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 5