From c3c80d650ca3523f5f113e20ed6d2a06993f9d19 Mon Sep 17 00:00:00 2001 From: Dariusz Niemczyk Date: Sat, 13 Jan 2024 23:30:50 +0100 Subject: [PATCH] fix: weird docker compose hacks --- docker-compose.prod-override.yml | 4 ++-- docker-compose.yml | 5 +++++ spejstore-dev.env | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/docker-compose.prod-override.yml b/docker-compose.prod-override.yml index dee95a9..8826d7a 100644 --- a/docker-compose.prod-override.yml +++ b/docker-compose.prod-override.yml @@ -3,6 +3,6 @@ version: "3" services: db: volumes: - - /var/spejstore-data:/var/lib/postgresql/data + - /var/spejstore-data-new:/var/lib/postgresql/data web: - image: registry.k0.hswaw.net/palid/spejstore:1689856372 + build: . diff --git a/docker-compose.yml b/docker-compose.yml index 1c4de5b..12b4055 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,6 +26,11 @@ services: depends_on: db: condition: service_healthy + env_file: + - path: .env + required: true + - path: ./spejstore-dev.env + required: false environment: - SPEJSTORE_CLIENT_ID - SPEJSTORE_SECRET diff --git a/spejstore-dev.env b/spejstore-dev.env index 5af62a3..b1a28b1 100644 --- a/spejstore-dev.env +++ b/spejstore-dev.env @@ -1,3 +1,7 @@ SPEJSTORE_CLIENT_ID=inventory SPEJSTORE_SECRET=secret SPEJSTORE_ALLOWED_HOSTS=localhost,127.0.0.1 +SPEJSTORE_DB_NAME=postgres +SPEJSTORE_DB_PASSWORD=postgres +SPEJSTORE_DB_USER=postgres +SPEJSTORE_DB_HOST=db