From 6eefd51180042cb2b054067a6e98f093084257d4 Mon Sep 17 00:00:00 2001 From: Akash Jain <15995028+akash-jain-10@users.noreply.github.com> Date: Wed, 6 Dec 2023 19:56:19 +0530 Subject: [PATCH] fix: `AIRFLOW_DB_PROPERTIES` default value in docker compose files (#14274) --- docker/development/docker-compose-postgres.yml | 2 +- docker/development/docker-compose.yml | 2 +- docker/docker-compose-ingestion/docker-compose-ingestion.yml | 2 +- docker/docker-compose-quickstart/docker-compose-postgres.yml | 2 +- docker/docker-compose-quickstart/docker-compose.yml | 2 +- ingestion/ingestion_dependency.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/development/docker-compose-postgres.yml b/docker/development/docker-compose-postgres.yml index 24e5d8912b3b..4aa7d14e9b9f 100644 --- a/docker/development/docker-compose-postgres.yml +++ b/docker/development/docker-compose-postgres.yml @@ -361,7 +361,7 @@ services: # EXAMPLE # require SSL (only for Postgres) # properties: "?sslmode=require" - DB_PROPERTIES: ${AIRFLOW_DB_PROPERTIES:-""} + DB_PROPERTIES: ${AIRFLOW_DB_PROPERTIES:-} # To test the lineage backend # AIRFLOW__LINEAGE__BACKEND: airflow_provider_openmetadata.lineage.backend.OpenMetadataLineageBackend # AIRFLOW__LINEAGE__AIRFLOW_SERVICE_NAME: local_airflow diff --git a/docker/development/docker-compose.yml b/docker/development/docker-compose.yml index 120963184b24..4cc1e7e98752 100644 --- a/docker/development/docker-compose.yml +++ b/docker/development/docker-compose.yml @@ -363,7 +363,7 @@ services: # EXAMPLE # require SSL (only for Postgres) # properties: "?sslmode=require" - DB_PROPERTIES: ${AIRFLOW_DB_PROPERTIES:-""} + DB_PROPERTIES: ${AIRFLOW_DB_PROPERTIES:-} # To test the lineage backend # AIRFLOW__LINEAGE__BACKEND: airflow_provider_openmetadata.lineage.backend.OpenMetadataLineageBackend diff --git a/docker/docker-compose-ingestion/docker-compose-ingestion.yml b/docker/docker-compose-ingestion/docker-compose-ingestion.yml index f4a4ebdadd4c..02cacb954c28 100644 --- a/docker/docker-compose-ingestion/docker-compose-ingestion.yml +++ b/docker/docker-compose-ingestion/docker-compose-ingestion.yml @@ -33,7 +33,7 @@ services: # EXAMPLE # require SSL (only for Postgres) # properties: "?sslmode=require" - DB_PROPERTIES: ${AIRFLOW_DB_PROPERTIES:-""} + DB_PROPERTIES: ${AIRFLOW_DB_PROPERTIES:-} # To test the lineage backend # AIRFLOW__LINEAGE__BACKEND: airflow_provider_openmetadata.lineage.backend.OpenMetadataLineageBackend # AIRFLOW__LINEAGE__AIRFLOW_SERVICE_NAME: local_airflow diff --git a/docker/docker-compose-quickstart/docker-compose-postgres.yml b/docker/docker-compose-quickstart/docker-compose-postgres.yml index a016768c78c3..aea3ada072b6 100644 --- a/docker/docker-compose-quickstart/docker-compose-postgres.yml +++ b/docker/docker-compose-quickstart/docker-compose-postgres.yml @@ -372,7 +372,7 @@ services: # EXAMPLE # require SSL (only for Postgres) # properties: "?sslmode=require" - DB_PROPERTIES: ${AIRFLOW_DB_PROPERTIES:-""} + DB_PROPERTIES: ${AIRFLOW_DB_PROPERTIES:-} # To test the lineage backend # AIRFLOW__LINEAGE__BACKEND: airflow_provider_openmetadata.lineage.backend.OpenMetadataLineageBackend # AIRFLOW__LINEAGE__AIRFLOW_SERVICE_NAME: local_airflow diff --git a/docker/docker-compose-quickstart/docker-compose.yml b/docker/docker-compose-quickstart/docker-compose.yml index 0303f8b98e3b..fbb4237b32a5 100644 --- a/docker/docker-compose-quickstart/docker-compose.yml +++ b/docker/docker-compose-quickstart/docker-compose.yml @@ -370,7 +370,7 @@ services: # EXAMPLE # require SSL (only for Postgres) # properties: "?sslmode=require" - DB_PROPERTIES: ${AIRFLOW_DB_PROPERTIES:-""} + DB_PROPERTIES: ${AIRFLOW_DB_PROPERTIES:-} # To test the lineage backend # AIRFLOW__LINEAGE__BACKEND: airflow_provider_openmetadata.lineage.backend.OpenMetadataLineageBackend # AIRFLOW__LINEAGE__AIRFLOW_SERVICE_NAME: local_airflow diff --git a/ingestion/ingestion_dependency.sh b/ingestion/ingestion_dependency.sh index 2d0d864c1896..f7044d231522 100755 --- a/ingestion/ingestion_dependency.sh +++ b/ingestion/ingestion_dependency.sh @@ -17,7 +17,7 @@ AIRFLOW_DB=${AIRFLOW_DB:-airflow_db} DB_USER=${DB_USER:-airflow_user} DB_SCHEME=${DB_SCHEME:-mysql+pymysql} DB_PASSWORD=${DB_PASSWORD:-airflow_pass} -DB_PROPERTIES=${DB_PROPERTIES} +DB_PROPERTIES=${DB_PROPERTIES:-""} AIRFLOW_ADMIN_USER=${AIRFLOW_ADMIN_USER:-admin} AIRFLOW_ADMIN_PASSWORD=${AIRFLOW_ADMIN_PASSWORD:-admin}