diff --git a/Dockerfile.ci b/Dockerfile.ci index 1e52b4fc59eed..aa9114ab6b5c9 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -984,6 +984,11 @@ function environment_initialization() { set +e + # shellcheck source=scripts/in_container/configure_environment.sh + . "${IN_CONTAINER_DIR}/configure_environment.sh" + # shellcheck source=scripts/in_container/run_init_script.sh + . "${IN_CONTAINER_DIR}/run_init_script.sh" + "${IN_CONTAINER_DIR}/check_environment.sh" ENVIRONMENT_EXIT_CODE=$? set -e @@ -993,6 +998,7 @@ function environment_initialization() { echo exit ${ENVIRONMENT_EXIT_CODE} fi + mkdir -p /usr/lib/google-cloud-sdk/bin touch /usr/lib/google-cloud-sdk/bin/gcloud ln -s -f /usr/bin/gcloud /usr/lib/google-cloud-sdk/bin/gcloud @@ -1018,12 +1024,6 @@ function environment_initialization() { ssh-keyscan -H localhost >> ~/.ssh/known_hosts 2>/dev/null fi - # shellcheck source=scripts/in_container/configure_environment.sh - . "${IN_CONTAINER_DIR}/configure_environment.sh" - - # shellcheck source=scripts/in_container/run_init_script.sh - . "${IN_CONTAINER_DIR}/run_init_script.sh" - cd "${AIRFLOW_SOURCES}" # Temporarily add /opt/airflow/providers/standard/tests to PYTHONPATH in order to see example dags diff --git a/scripts/docker/entrypoint_ci.sh b/scripts/docker/entrypoint_ci.sh index bd7fbc82807db..92d2afcb0b5a2 100755 --- a/scripts/docker/entrypoint_ci.sh +++ b/scripts/docker/entrypoint_ci.sh @@ -144,6 +144,11 @@ function environment_initialization() { set +e + # shellcheck source=scripts/in_container/configure_environment.sh + . "${IN_CONTAINER_DIR}/configure_environment.sh" + # shellcheck source=scripts/in_container/run_init_script.sh + . "${IN_CONTAINER_DIR}/run_init_script.sh" + "${IN_CONTAINER_DIR}/check_environment.sh" ENVIRONMENT_EXIT_CODE=$? set -e @@ -153,6 +158,7 @@ function environment_initialization() { echo exit ${ENVIRONMENT_EXIT_CODE} fi + mkdir -p /usr/lib/google-cloud-sdk/bin touch /usr/lib/google-cloud-sdk/bin/gcloud ln -s -f /usr/bin/gcloud /usr/lib/google-cloud-sdk/bin/gcloud @@ -178,12 +184,6 @@ function environment_initialization() { ssh-keyscan -H localhost >> ~/.ssh/known_hosts 2>/dev/null fi - # shellcheck source=scripts/in_container/configure_environment.sh - . "${IN_CONTAINER_DIR}/configure_environment.sh" - - # shellcheck source=scripts/in_container/run_init_script.sh - . "${IN_CONTAINER_DIR}/run_init_script.sh" - cd "${AIRFLOW_SOURCES}" # Temporarily add /opt/airflow/providers/standard/tests to PYTHONPATH in order to see example dags diff --git a/scripts/in_container/check_environment.sh b/scripts/in_container/check_environment.sh index 9f3e67172fc83..6c385f9817316 100755 --- a/scripts/in_container/check_environment.sh +++ b/scripts/in_container/check_environment.sh @@ -95,8 +95,6 @@ function startairflow_if_requested() { echo export AIRFLOW__CORE__LOAD_EXAMPLES=${LOAD_EXAMPLES} - . "$( dirname "${BASH_SOURCE[0]}" )/configure_environment.sh" - if airflow db migrate then if [[ ${LOAD_DEFAULT_CONNECTIONS=} == "true" || ${LOAD_DEFAULT_CONNECTIONS=} == "True" ]]; then @@ -119,9 +117,6 @@ function startairflow_if_requested() { else echo "Skipping user creation as auth manager different from Fab is used" fi - - . "$( dirname "${BASH_SOURCE[0]}" )/run_init_script.sh" - fi return $? }