fix: make portainer stacks use stack env only

This commit is contained in:
ginnoir
2026-06-14 22:56:38 -05:00
parent 2a76a8f1f8
commit ef107dd743
4 changed files with 43 additions and 29 deletions
+26 -26
View File
@@ -20,7 +20,7 @@ services:
environment:
- PUID=1000
- PGID=1000
- TZ=${TZ}
- TZ
- DEFAULT_WORKSPACE=/workspace
# Authentik forward_auth at the edge — local password auth disabled via config mount.
volumes:
@@ -52,13 +52,13 @@ services:
environment:
- PUID=1000
- PGID=1000
- TZ=${TZ}
- TZ
- APP_URL=https://docs.ginnoir.com
- APP_KEY=${BOOKSTACK_APP_KEY}
- APP_KEY
- DB_HOST=mariadb_bookstack
- DB_PORT=3306
- DB_USER=bookstack
- DB_PASS=${BOOKSTACK_DB_PASSWORD}
- DB_PASS
- DB_DATABASE=bookstack
- AUTH_METHOD=oidc
- AUTH_AUTO_INITIATE=false
@@ -86,11 +86,11 @@ services:
environment:
- PUID=1000
- PGID=1000
- TZ=${TZ}
- MYSQL_ROOT_PASSWORD=${BOOKSTACK_DB_ROOT_PASSWORD}
- TZ
- MYSQL_ROOT_PASSWORD
- MYSQL_DATABASE=bookstack
- MYSQL_USER=bookstack
- MYSQL_PASSWORD=${BOOKSTACK_DB_PASSWORD}
- MYSQL_PASSWORD
volumes:
- /config/bookstack-db:/config
healthcheck:
@@ -138,15 +138,15 @@ services:
env_file:
- stack.env
environment:
- SECRET_KEY=${PLANE_SECRET_KEY}
- SECRET_KEY
- DEBUG=0
- DATABASE_URL=postgresql://plane:${PLANE_DB_PASSWORD}@postgres_plane:5432/plane
- DATABASE_URL
- REDIS_URL=redis://redis_plane:6379/
- CELERY_BROKER_URL=redis://redis_plane:6379/0
- USE_MINIO=1
- AWS_REGION=us-east-1
- AWS_ACCESS_KEY_ID=${PLANE_MINIO_USER}
- AWS_SECRET_ACCESS_KEY=${PLANE_MINIO_PASSWORD}
- AWS_ACCESS_KEY_ID
- AWS_SECRET_ACCESS_KEY
- AWS_S3_ENDPOINT_URL=http://plane_minio:9000
- AWS_S3_BUCKET_NAME=uploads
- WEB_URL=https://plane.ginnoir.com
@@ -169,15 +169,15 @@ services:
env_file:
- stack.env
environment:
- SECRET_KEY=${PLANE_SECRET_KEY}
- SECRET_KEY
- DEBUG=0
- DATABASE_URL=postgresql://plane:${PLANE_DB_PASSWORD}@postgres_plane:5432/plane
- DATABASE_URL
- REDIS_URL=redis://redis_plane:6379/
- CELERY_BROKER_URL=redis://redis_plane:6379/0
- USE_MINIO=1
- AWS_REGION=us-east-1
- AWS_ACCESS_KEY_ID=${PLANE_MINIO_USER}
- AWS_SECRET_ACCESS_KEY=${PLANE_MINIO_PASSWORD}
- AWS_ACCESS_KEY_ID
- AWS_SECRET_ACCESS_KEY
- AWS_S3_ENDPOINT_URL=http://plane_minio:9000
- AWS_S3_BUCKET_NAME=uploads
depends_on:
@@ -197,9 +197,9 @@ services:
env_file:
- stack.env
environment:
- SECRET_KEY=${PLANE_SECRET_KEY}
- SECRET_KEY
- DEBUG=0
- DATABASE_URL=postgresql://plane:${PLANE_DB_PASSWORD}@postgres_plane:5432/plane
- DATABASE_URL
- REDIS_URL=redis://redis_plane:6379/
- CELERY_BROKER_URL=redis://redis_plane:6379/0
depends_on:
@@ -219,8 +219,8 @@ services:
env_file:
- stack.env
environment:
- SECRET_KEY=${PLANE_SECRET_KEY}
- DATABASE_URL=postgresql://plane:${PLANE_DB_PASSWORD}@postgres_plane:5432/plane
- SECRET_KEY
- DATABASE_URL
- REDIS_URL=redis://redis_plane:6379/
depends_on:
postgres_plane:
@@ -245,8 +245,8 @@ services:
env_file:
- stack.env
environment:
- MINIO_USER=${PLANE_MINIO_USER}
- MINIO_PASSWORD=${PLANE_MINIO_PASSWORD}
- MINIO_USER
- MINIO_PASSWORD
postgres_plane:
container_name: postgres_plane
@@ -258,9 +258,9 @@ services:
env_file:
- stack.env
environment:
POSTGRES_USER: plane
POSTGRES_PASSWORD: ${PLANE_DB_PASSWORD}
POSTGRES_DB: plane
- POSTGRES_USER=plane
- POSTGRES_PASSWORD
- POSTGRES_DB=plane
volumes:
- /config/plane/postgres:/var/lib/postgresql/data
healthcheck:
@@ -296,8 +296,8 @@ services:
env_file:
- stack.env
environment:
MINIO_ROOT_USER: ${PLANE_MINIO_USER}
MINIO_ROOT_PASSWORD: ${PLANE_MINIO_PASSWORD}
- MINIO_ROOT_USER
- MINIO_ROOT_PASSWORD
volumes:
- /storage1/labdata/plane/minio:/data
healthcheck: