diff --git a/production_entrypoint.sh b/production_entrypoint.sh index 1415f92..afd588c 100755 --- a/production_entrypoint.sh +++ b/production_entrypoint.sh @@ -13,6 +13,9 @@ fi if test -f "$GOOGLE_CREDS_FILE"; then export GOOGLE_CREDS=$(cat $GOOGLE_CREDS_FILE) fi +if test -f "$GROUP_KEY_FILE"; then + export GROUP_KEY=$(cat $GROUP_KEY_FILE) +fi # Collect static files echo "Collect static files" diff --git a/stack-compose-dev.yml b/stack-compose-dev.yml index d92b95f..ae075f6 100644 --- a/stack-compose-dev.yml +++ b/stack-compose-dev.yml @@ -29,15 +29,23 @@ services: - FRONTEND_URL=dev.sahkoinsinoorikilta.fi - DEBUG=True - EMAIL_API_KEY_FILE=/run/secrets/DJANGO_EMAIL_API_KEY + - GOOGLE_CREDS_FILE=/run/secrets/BACKEND_GOOGLE_CREDS + - GROUP_KEY_FILE=/run/secrets/BACKEND_GROUP_KEY - DB_HOST=db - DB_PORT=5432 secrets: - DJANGO_EMAIL_API_KEY + - BACKEND_GOOGLE_CREDS + - BACKEND_GROUP_KEY secrets: DJANGO_EMAIL_API_KEY: external: true + BACKEND_GOOGLE_CREDS: + external: true + BACKEND_GROUP_KEY: + external: true volumes: dbdata: diff --git a/stack-compose.yml b/stack-compose.yml index d780df1..7f1bfc6 100644 --- a/stack-compose.yml +++ b/stack-compose.yml @@ -35,12 +35,14 @@ services: - DB_PASSWD_FILE=/run/secrets/BACKEND_DB_PASSWD - EMAIL_API_KEY_FILE=/run/secrets/BACKEND_EMAIL_API_KEY - GOOGLE_CREDS_FILE=/run/secrets/BACKEND_GOOGLE_CREDS + - GROUP_KEY_FILE=/run/secrets/BACKEND_GROUP_KEY secrets: - BACKEND_SECRET_KEY - BACKEND_DB_PASSWD - BACKEND_EMAIL_API_KEY - BACKEND_GOOGLE_CREDS + - BACKEND_GROUP_KEY secrets: BACKEND_SECRET_KEY: @@ -51,3 +53,5 @@ secrets: external: true BACKEND_GOOGLE_CREDS: external: true + BACKEND_GROUP_KEY: + external: true