diff --git a/compose.yaml b/compose.yaml index cfbdefb..0ddd101 100644 --- a/compose.yaml +++ b/compose.yaml @@ -5,13 +5,7 @@ services: - proxy - internal environment: - - TYPEORM_DATABASE=grist - - TYPEORM_TYPE=postgres - - TYPEORM_USERNAME=grist - - TYPEORM_PASSWORD_FILE=/run/secrets/db_password - - TYPEORM_HOST=db - GRIST_REDIS_URL=redis://${STACK_NAME}_redis:6379 - - GRIST_DATA_DIR=/var/grist-data - GRIST_SUPPORT_ANON - GRIST_SESSION_SECRET_FILE=/run/secrets/session_secret - GRIST_SANDBOX_FLAVOR @@ -29,7 +23,6 @@ services: - GRIST_OIDC_IDP_CLIENT_ID - GRIST_OIDC_IDP_CLIENT_SECRET_FILE=/run/secrets/oidc_idp_client_secret secrets: - - db_password - session_secret - oidc_idp_client_secret volumes: @@ -53,19 +46,6 @@ services: - "caddy.reverse_proxy={{upstreams 8484}}" - "caddy.tls.on_demand=" - db: - image: postgres:13 - networks: - - internal - secrets: - - db_password - volumes: - - 'postgresql_data:/var/lib/postgresql/data' - environment: - - POSTGRES_USER=grist - - POSTGRES_DB=grist - - POSTGRES_PASSWORD_FILE=/run/secrets/db_password - redis: image: redis:7.2-alpine networks: @@ -78,9 +58,6 @@ configs: file: entrypoint.sh secrets: - db_password: - external: true - name: ${STACK_NAME}_db_password session_secret: external: true name: ${STACK_NAME}_session_secret @@ -89,7 +66,6 @@ secrets: name: ${STACK_NAME}_oidc_idp_client_secret volumes: - postgresql_data: redis_data: grist_data: diff --git a/entrypoint.sh b/entrypoint.sh index f58f57c..6e32905 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -22,7 +22,6 @@ file_env() { unset "$fileVar" } -file_env TYPEORM_PASSWORD file_env GRIST_SESSION_SECRET file_env GRIST_OIDC_IDP_CLIENT_SECRET