From c019a412ac94538fb96bfd6c6664a2d1fafe8fa6 Mon Sep 17 00:00:00 2001 From: Charlie Lu Date: Tue, 23 Apr 2024 11:53:24 +1000 Subject: [PATCH] changes to reflect PR comments --- docker/Dockerfile | 2 +- docker/script/entrypoint.sh | 4 ++-- requirements/requirements.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 782f399e3..7c03d53f0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -21,7 +21,7 @@ ARG INDEX_URL="" ENV AIRFLOW_HOME=${AIRFLOW_USER_HOME} ENV PATH="$PATH:/usr/local/airflow/.local/bin:/root/.local/bin:/usr/local/airflow/.local/lib/python3.10/site-packages" ENV PYTHON_VERSION=3.11.6 -ENV AIRFLOW_VERSION=2.7.2 +ENV AIRFLOW_VERSION=${AIRFLOW_VERSION} COPY script/bootstrap.sh /bootstrap.sh COPY script/systemlibs.sh /systemlibs.sh diff --git a/docker/script/entrypoint.sh b/docker/script/entrypoint.sh index b06eb26b6..a7dc27ff3 100644 --- a/docker/script/entrypoint.sh +++ b/docker/script/entrypoint.sh @@ -41,11 +41,11 @@ package_requirements() { if [[ -e "$AIRFLOW_HOME/$REQUIREMENTS_FILE" ]]; then echo "Packaging requirements.txt into plugins" pip3 download -r "$AIRFLOW_HOME/$REQUIREMENTS_FILE" -d "$AIRFLOW_HOME/plugins" - wget "https://raw.githubusercontent.com/apache/airflow/constraints-${AIRFLOW_VERSION}/constraints-${PYTHON_VERSION%.*}.txt" -O $AIRFLOW_HOME/plugins/constraints.txt + wget "https://raw.githubusercontent.com/aws/aws-mwaa-local-runner/v${AIRFLOW_VERSION}/docker/config/constraints.txt" -O $AIRFLOW_HOME/plugins/constraints.txt cd "$AIRFLOW_HOME/plugins" zip "$AIRFLOW_HOME/requirements/plugins.zip" * printf '%s\n%s\n' "--no-index" "$(cat $AIRFLOW_HOME/$REQUIREMENTS_FILE)" > "$AIRFLOW_HOME/requirements/packaged_requirements.txt" - printf '%s\n%s\n%s\n%s\n' "--find-links /usr/local/airflow/plugins" "--constraint /usr/local/airflow/plugins/constraints.txt" "$(cat $AIRFLOW_HOME/requirements/packaged_requirements.txt | grep -v '^--constraint .https://*')" > "$AIRFLOW_HOME/requirements/packaged_requirements.txt" + printf '%s\n%s\n%s\n%s\n' "--find-links /usr/local/airflow/plugins" "--constraint /usr/local/airflow/plugins/constraints.txt" "$(cat $AIRFLOW_HOME/requirements/packaged_requirements.txt | grep -v '^--constraint')" > "$AIRFLOW_HOME/requirements/packaged_requirements.txt" fi } diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 185cda4e4..f94740373 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,4 +1,4 @@ ---constraint "https://raw.githubusercontent.com/apache/airflow/constraints-2.7.2/constraints-3.11.txt" +--constraint "https://raw.githubusercontent.com/aws/aws-mwaa-local-runner/v2.7.2/docker/config/constraints.txt" apache-airflow-providers-snowflake==5.0.1 apache-airflow-providers-mysql==5.3.1