From 31566d1bd8974a909f40761ff56a148aa6400f4b Mon Sep 17 00:00:00 2001 From: Cedric Date: Sun, 12 Jan 2025 14:14:13 +0100 Subject: [PATCH] adjusted compose --- docker-compose.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 886656c..7d64546 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,15 +1,17 @@ version: "3.8" services: 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 ports: - 3636:8080 environment: GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID} GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET} - DB_PORT: 5434 - DB_NAME: ${DB_P_NAME} + DB_PORT: 5432 + DB_P_NAME: xpensely DB_USERNAME: ${DB_USERNAME} DB_PASSWORD: ${DB_PASSWORD} depends_on: @@ -18,12 +20,14 @@ services: 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: - - 5434:5432 + - 5432:5432 environment: - POSTGRES_DB: ${DB_P_NAME} + POSTGRES_DB: xpensely POSTGRES_USER: ${DB_USERNAME} POSTGRES_PASSWORD: ${DB_PASSWORD} networks: @@ -32,7 +36,9 @@ services: - db_data:/var/lib/postgresql/data restart: unless-stopped healthcheck: - test: ["CMD-SHELL", "pg_isready -U ${DB_USERNAME}"] + test: + - CMD-SHELL + - pg_isready -U ${DB_USERNAME} -d xpensely interval: 10s timeout: 5s retries: 5