Skip to content
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

Jump to bottom

fix(dev): fix env file overrides for profiles #10194

Merged
merged 1 commit into from
Apr 3, 2024
Merged

fix(dev): fix env file overrides for profiles #10194

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 docker/profiles/docker-compose.actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ x-datahub-actions-service: &datahub-actions-service
image: ${DATAHUB_ACTIONS_IMAGE:-${DATAHUB_ACTIONS_REPO:-acryldata}/datahub-actions}:${ACTIONS_VERSION:-v0.0.14}
env_file:
- datahub-actions/env/docker.env
- ${DATAHUB_LOCAL_COMMON_ENV:-datahub-actions/env/docker.env}
- ${DATAHUB_LOCAL_ACTIONS_ENV:-datahub-actions/env/docker.env}
- ${DATAHUB_LOCAL_COMMON_ENV:-empty.env}
- ${DATAHUB_LOCAL_ACTIONS_ENV:-empty.env}
environment:
ACTIONS_EXTRA_PACKAGES: ${ACTIONS_EXTRA_PACKAGES:-}
ACTIONS_CONFIG: ${ACTIONS_CONFIG:-}
Expand Down
4 changes: 2 additions & 2 deletions docker/profiles/docker-compose.frontend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ x-datahub-frontend-service: &datahub-frontend-service
- ${DATAHUB_MAPPED_FRONTEND_PORT:-9002}:9002
env_file:
- datahub-frontend/env/docker.env
- ${DATAHUB_LOCAL_COMMON_ENV:-datahub-frontend/env/docker.env}
- ${DATAHUB_LOCAL_FRONTEND_ENV:-datahub-frontend/env/docker.env}
- ${DATAHUB_LOCAL_COMMON_ENV:-empty.env}
- ${DATAHUB_LOCAL_FRONTEND_ENV:-empty.env}
environment: &datahub-frontend-service-env
KAFKA_BOOTSTRAP_SERVER: broker:29092
volumes:
Expand Down
16 changes: 8 additions & 8 deletions docker/profiles/docker-compose.gms.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ x-datahub-system-update-service: &datahub-system-update-service
- SystemUpdate
env_file:
- datahub-upgrade/env/docker.env
- ${DATAHUB_LOCAL_COMMON_ENV:-datahub-upgrade/env/docker.env}
- ${DATAHUB_LOCAL_SYS_UPDATE_ENV:-datahub-upgrade/env/docker.env}
- ${DATAHUB_LOCAL_COMMON_ENV:-empty.env}
- ${DATAHUB_LOCAL_SYS_UPDATE_ENV:-empty.env}
environment: &datahub-system-update-env
<<: [*primary-datastore-mysql-env, *graph-datastore-search-env, *search-datastore-env, *kafka-env]
SCHEMA_REGISTRY_SYSTEM_UPDATE: ${SCHEMA_REGISTRY_SYSTEM_UPDATE:-true}
Expand Down Expand Up @@ -95,8 +95,8 @@ x-datahub-gms-service: &datahub-gms-service
- ${DATAHUB_MAPPED_GMS_PORT:-8080}:8080
env_file:
- datahub-gms/env/docker.env
- ${DATAHUB_LOCAL_COMMON_ENV:-datahub-gms/env/docker.env}
- ${DATAHUB_LOCAL_GMS_ENV:-datahub-gms/env/docker.env}
- ${DATAHUB_LOCAL_COMMON_ENV:-empty.env}
- ${DATAHUB_LOCAL_GMS_ENV:-empty.env}
environment: &datahub-gms-env
<<: [*primary-datastore-mysql-env, *graph-datastore-search-env, *search-datastore-env, *datahub-quickstart-telemetry-env, *kafka-env]
healthcheck:
Expand Down Expand Up @@ -142,8 +142,8 @@ x-datahub-mae-consumer-service: &datahub-mae-consumer-service
- 9091:9091
env_file:
- datahub-mae-consumer/env/docker.env
- ${DATAHUB_LOCAL_COMMON_ENV:-datahub-mae-consumer/env/docker.env}
- ${DATAHUB_LOCAL_MAE_ENV:-datahub-mae-consumer/env/docker.env}
- ${DATAHUB_LOCAL_COMMON_ENV:-empty.env}
- ${DATAHUB_LOCAL_MAE_ENV:-empty.env}
environment: &datahub-mae-consumer-env
<<: [*primary-datastore-mysql-env, *graph-datastore-search-env, *search-datastore-env, *kafka-env]

Expand All @@ -168,8 +168,8 @@ x-datahub-mce-consumer-service: &datahub-mce-consumer-service
- 9090:9090
env_file:
- datahub-mce-consumer/env/docker.env
- ${DATAHUB_LOCAL_COMMON_ENV:-datahub-mce-consumer/env/docker.env}
- ${DATAHUB_LOCAL_MCE_ENV:-datahub-mce-consumer/env/docker.env}
- ${DATAHUB_LOCAL_COMMON_ENV:-empty.env}
- ${DATAHUB_LOCAL_MCE_ENV:-empty.env}
environment: &datahub-mce-consumer-env
<<: [*primary-datastore-mysql-env, *graph-datastore-search-env, *search-datastore-env, *datahub-quickstart-telemetry-env, *kafka-env]

Expand Down
4 changes: 4 additions & 0 deletions docker/profiles/empty.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Docker compose requires that all env_file entries exist.
# Because we have some optional env_file entries that can be set
# as environment variables, we need a default file to point at
# when those are not set.
Loading