From 4b1985d9829c25688995236b53b8f3ee302c2637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20B=C3=B6ttcher?= <c.boettcher@fz-juelich.de> Date: Thu, 23 Feb 2023 10:44:20 +0100 Subject: [PATCH] include webserver config in docker file --- dockers/eflows-airflow.docker | 5 ++++- scripts/deployment.sh | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dockers/eflows-airflow.docker b/dockers/eflows-airflow.docker index df0e273..c04e02f 100644 --- a/dockers/eflows-airflow.docker +++ b/dockers/eflows-airflow.docker @@ -8,4 +8,7 @@ USER airflow RUN pip --version && python -m pip install --upgrade pip ADD requirements.txt /requirements.txt -RUN pip install -r /requirements.txt \ No newline at end of file +RUN pip install -r /requirements.txt + +# Copy the OIDC webserver_config.py into the container's $AIRFLOW_HOME +COPY webserver_config.py $AIRFLOW_HOME/webserver_config.py \ No newline at end of file diff --git a/scripts/deployment.sh b/scripts/deployment.sh index 5649a8c..39d1b39 100755 --- a/scripts/deployment.sh +++ b/scripts/deployment.sh @@ -45,7 +45,6 @@ rm -rf $AIRFLOW_DIR/dags && mkdir $AIRFLOW_DIR/dags && git clone $DAG_GIT_URL $A cp -r plugins/* $AIRFLOW_DIR/plugins cp config/* $AIRFLOW_DIR/config/ cp -r templates/* $AIRFLOW_DIR/templates -cp webserver_config.py $AIRFLOW_DIR/webserver_config.py cp client_secrets.json $AIRFLOW_DIR/client_secrets.json # Setup environment variables and install requirements echo -e "AIRFLOW_UID=$(id -u)" > $GIT_REPO/dockers/.env -- GitLab