stack: drop compose defaults; only image tag (dev/latest) lives in .env

This commit is contained in:
Ivo Oskamp 2026-05-28 16:53:51 +02:00
parent cd08067be3
commit d9a4eada20
2 changed files with 17 additions and 19 deletions

View File

@ -1,15 +1,13 @@
CLEARVIEW_IMAGE=gitea.oskamp.info/ivooskamp/clearview:dev
CLEARVIEW_IMAGE_TAG=dev
CLEARVIEW_PORT=8080
TZ=Europe/Amsterdam
POSTGRES_IMAGE=postgres:16-alpine
POSTGRES_HOST=postgres
POSTGRES_PORT=5432
POSTGRES_DB=clearview
POSTGRES_USER=clearview
POSTGRES_PASSWORD=clearview
ADMINER_IMAGE=adminer:4-standalone
ADMINER_PORT=8081
DATABASE_URL=postgresql://clearview:clearview@postgres:5432/clearview

View File

@ -1,46 +1,46 @@
services:
clearview:
image: ${CLEARVIEW_IMAGE:-gitea.oskamp.info/ivooskamp/clearview:dev}
image: gitea.oskamp.info/ivooskamp/clearview:${CLEARVIEW_IMAGE_TAG}
container_name: clearview
restart: unless-stopped
ports:
- "${CLEARVIEW_PORT:-8080}:80"
- "${CLEARVIEW_PORT}:80"
environment:
TZ: ${TZ:-Europe/Amsterdam}
DATABASE_URL: ${DATABASE_URL:-postgresql://${POSTGRES_USER:-clearview}:${POSTGRES_PASSWORD:-clearview}@${POSTGRES_HOST:-postgres}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-clearview}}
ONBOARDING_CLIENT_ID: ${ONBOARDING_CLIENT_ID:-}
ONBOARDING_CLIENT_SECRET: ${ONBOARDING_CLIENT_SECRET:-}
ONBOARDING_REDIRECT_URI: ${ONBOARDING_REDIRECT_URI:-}
TZ: ${TZ}
DATABASE_URL: ${DATABASE_URL}
ONBOARDING_CLIENT_ID: ${ONBOARDING_CLIENT_ID}
ONBOARDING_CLIENT_SECRET: ${ONBOARDING_CLIENT_SECRET}
ONBOARDING_REDIRECT_URI: ${ONBOARDING_REDIRECT_URI}
depends_on:
postgres:
condition: service_healthy
postgres:
image: ${POSTGRES_IMAGE:-postgres:16-alpine}
image: postgres:16-alpine
container_name: clearview-postgres
restart: unless-stopped
environment:
POSTGRES_DB: ${POSTGRES_DB:-clearview}
POSTGRES_USER: ${POSTGRES_USER:-clearview}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-clearview}
TZ: ${TZ:-Europe/Amsterdam}
POSTGRES_DB: ${POSTGRES_DB}
POSTGRES_USER: ${POSTGRES_USER}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
TZ: ${TZ}
volumes:
- /docker/appdata/clearview/postgres:/var/lib/postgresql/data
healthcheck:
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-clearview} -d ${POSTGRES_DB:-clearview}"]
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
interval: 10s
timeout: 5s
retries: 5
start_period: 10s
adminer:
image: ${ADMINER_IMAGE:-adminer:4-standalone}
image: adminer:4-standalone
container_name: clearview-adminer
restart: unless-stopped
depends_on:
postgres:
condition: service_healthy
ports:
- "${ADMINER_PORT:-8081}:8080"
- "${ADMINER_PORT}:8080"
environment:
ADMINER_DEFAULT_SERVER: ${POSTGRES_HOST:-postgres}
ADMINER_DEFAULT_SERVER: ${POSTGRES_HOST}