Skip to content

Give empty defaults to optional action-cookie related env vars in docker compose, to avoid warnings when not passed #1791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dandelany merged 1 commit into from
Feb 25, 2026
Merged

Give empty defaults to optional action-cookie related env vars in docker compose, to avoid warnings when not passed #1791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deployment/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ services:
MERLIN_GRAPHQL_URL: http://hasura:8080/v1/graphql
AERIE_DB_HOST: postgres
AERIE_DB_PORT: 5432
ACTION_COOKIE_NAMES: "${ACTION_COOKIE_NAMES}"
ACTION_CORS_ALLOWED_ORIGIN: "${ACTION_CORS_ALLOWED_ORIGIN}"
ACTION_COOKIE_NAMES: "${ACTION_COOKIE_NAMES:-}"
ACTION_CORS_ALLOWED_ORIGIN: "${ACTION_CORS_ALLOWED_ORIGIN:-}"
ACTION_DB_USER: "${SEQUENCING_USERNAME}"
ACTION_DB_PASSWORD: "${SEQUENCING_PASSWORD}"
ACTION_LOCAL_STORE: /usr/src/app/action_file_store
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ services:
MERLIN_GRAPHQL_URL: http://hasura:8080/v1/graphql
AERIE_DB_HOST: postgres
AERIE_DB_PORT: 5432
ACTION_COOKIE_NAMES: "${ACTION_COOKIE_NAMES}"
ACTION_CORS_ALLOWED_ORIGIN: "${ACTION_CORS_ALLOWED_ORIGIN}"
ACTION_COOKIE_NAMES: "${ACTION_COOKIE_NAMES:-}"
ACTION_CORS_ALLOWED_ORIGIN: "${ACTION_CORS_ALLOWED_ORIGIN:-}"
ACTION_DB_USER: "${SEQUENCING_USERNAME}"
ACTION_DB_PASSWORD: "${SEQUENCING_PASSWORD}"
ACTION_LOCAL_STORE: /usr/src/app/action_file_store
Expand Down
4 changes: 2 additions & 2 deletions e2e-tests/docker-compose-many-workers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ services:
ACTION_SERVER_PORT: 27186
AERIE_DB_HOST: postgres
AERIE_DB_PORT: 5432
ACTION_COOKIE_NAMES: "${ACTION_COOKIE_NAMES}"
ACTION_CORS_ALLOWED_ORIGIN: "${ACTION_CORS_ALLOWED_ORIGIN}"
ACTION_COOKIE_NAMES: "${ACTION_COOKIE_NAMES:-}"
ACTION_CORS_ALLOWED_ORIGIN: "${ACTION_CORS_ALLOWED_ORIGIN:-}"
ACTION_DB_USER: "${SEQUENCING_USERNAME}"
ACTION_DB_PASSWORD: "${SEQUENCING_PASSWORD}"
ACTION_LOCAL_STORE: /usr/src/app/action_file_store
Expand Down
4 changes: 2 additions & 2 deletions e2e-tests/docker-compose-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ services:
MERLIN_GRAPHQL_URL: http://hasura:8080/v1/graphql
AERIE_DB_HOST: postgres
AERIE_DB_PORT: 5432
ACTION_COOKIE_NAMES: "${ACTION_COOKIE_NAMES}"
ACTION_CORS_ALLOWED_ORIGIN: "${ACTION_CORS_ALLOWED_ORIGIN}"
ACTION_COOKIE_NAMES: "${ACTION_COOKIE_NAMES:-}"
ACTION_CORS_ALLOWED_ORIGIN: "${ACTION_CORS_ALLOWED_ORIGIN:-}"
ACTION_DB_USER: "${SEQUENCING_USERNAME}"
ACTION_DB_PASSWORD: "${SEQUENCING_PASSWORD}"
ACTION_LOCAL_STORE: /usr/src/app/action_file_store
Expand Down
Loading