remove sql_alchemy_conn from airflow.cfg and use env variable

open-metadata · Nov 28, 2023 · 359654e · 359654e
1 parent 1a47d4d
commit 359654e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/docker/development/docker-compose-postgres.yml b/docker/development/docker-compose-postgres.yml
@@ -357,7 +357,7 @@ services:
       DB_PASSWORD: ${AIRFLOW_DB_PASSWORD:-airflow_pass}
     entrypoint: /bin/bash
     command:
-      - "/opt/airflow/ingestion_dependency.sh"
+      - "source /opt/airflow/ingestion_dependency.sh"
     depends_on:
       opensearch:
         condition: service_started

diff --git a/docker/development/docker-compose.yml b/docker/development/docker-compose.yml
@@ -358,7 +358,7 @@ services:
       DB_PASSWORD: ${AIRFLOW_DB_PASSWORD:-airflow_pass}
     entrypoint: /bin/bash
     command:
-      - "/opt/airflow/ingestion_dependency.sh"
+      - "source /opt/airflow/ingestion_dependency.sh"
     depends_on:
       elasticsearch:
         condition: service_started

diff --git a/docker/docker-compose-ingestion/docker-compose-ingestion.yml b/docker/docker-compose-ingestion/docker-compose-ingestion.yml
@@ -31,7 +31,7 @@ services:
       DB_PASSWORD: ${AIRFLOW_DB_PASSWORD:-airflow_pass}
     entrypoint: /bin/bash
     command:
-      - "/opt/airflow/ingestion_dependency.sh"
+      - "source /opt/airflow/ingestion_dependency.sh"
     expose:
       - 8080
     ports:

diff --git a/docker/docker-compose-quickstart/docker-compose-postgres.yml b/docker/docker-compose-quickstart/docker-compose-postgres.yml
@@ -368,7 +368,7 @@ services:
       DB_PASSWORD: ${AIRFLOW_DB_PASSWORD:-airflow_pass}
     entrypoint: /bin/bash
     command:
-      - "/opt/airflow/ingestion_dependency.sh"
+      - "source /opt/airflow/ingestion_dependency.sh"
     expose:
       - 8080
     ports:

diff --git a/docker/docker-compose-quickstart/docker-compose.yml b/docker/docker-compose-quickstart/docker-compose.yml
@@ -366,7 +366,7 @@ services:
       DB_PASSWORD: ${AIRFLOW_DB_PASSWORD:-airflow_pass}
     entrypoint: /bin/bash
     command:
-      - "/opt/airflow/ingestion_dependency.sh"
+      - "source /opt/airflow/ingestion_dependency.sh"
     expose:
       - 8080
     ports:

diff --git a/ingestion/ingestion_dependency.sh b/ingestion/ingestion_dependency.sh
@@ -25,7 +25,7 @@ AIRFLOW_ADMIN_PASSWORD=${AIRFLOW_ADMIN_PASSWORD:-admin}
 
 OPENMETADATA_SERVER=${OPENMETADATA_SERVER:-"http://openmetadata-server:8585"}
 
-sed -i 's,^#*[ ]*\(sql_alchemy_conn[ ]*=\).*,\1 '${DB_CONN}',g' /opt/airflow/airflow.cfg
+export AIRFLOW__DATABASE__SQL_ALCHEMY_CONN="${DB_CONN}"
 
 airflow db init