diff --git a/.env.example b/.env.example index 85a7e04..2c25119 100644 --- a/.env.example +++ b/.env.example @@ -26,10 +26,6 @@ R2_SECRET_ACCESS_KEY="" # R2 API token Secre R2_BUCKET="vash-esports-images" # Bucket name, e.g. vash-esports-images R2_PUBLIC_URL="https://cdn.esports.vash.software" # Public URL for the bucket, e.g. https://cdn.esports.vash.software -# Dozzle log viewer (https://dozzle.dev) -DOZZLE_USERNAME="admin" -DOZZLE_PASSWORD="" # Password for the Dozzle web UI - # Sentry error tracking (https://sentry.io) PUBLIC_SENTRY_DSN="" # DSN is write-only, safe to expose client-side SENTRY_AUTH_TOKEN="" # Only needed in CI for source map uploads diff --git a/.gitignore b/.gitignore index bede11a..cb2bbf0 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ vite.config.js.timestamp-* vite.config.ts.timestamp-* # Playwright test-results + +# Dozzle +dozzle-users.yml diff --git a/docker-compose.yml b/docker-compose.yml index 612dc6e..04dd6fb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -79,7 +79,11 @@ services: DATABASE_URL: postgresql://umami:${UMAMI_DB_PASSWORD}@umami-db:5432/umami APP_SECRET: ${UMAMI_APP_SECRET} healthcheck: - test: ['CMD-SHELL', 'wget -q -O /dev/null http://localhost:3001/api/heartbeat || exit 1'] + test: + [ + 'CMD-SHELL', + 'node -e "fetch(\"http://localhost:3000/api/heartbeat\").then(r=>{if(!r.ok)process.exit(1)}).catch(()=>process.exit(1))"' + ] interval: 15s timeout: 5s retries: 5 @@ -89,13 +93,10 @@ services: image: amir20/dozzle:latest restart: unless-stopped ports: - - '127.0.0.1:8080:8080' # Proxy via nginx at e.g. logs.vash.software + - '127.0.0.1:8080:8080' # Proxy via nginx at logs.vash.software volumes: - /var/run/docker.sock:/var/run/docker.sock:ro - environment: - DOZZLE_AUTH_PROVIDER: simple - DOZZLE_USERNAME: ${DOZZLE_USERNAME:-admin} - DOZZLE_PASSWORD: ${DOZZLE_PASSWORD} + - ./dozzle-users.yml:/data/users.yml:ro volumes: pgdata: