This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch v1-10-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit fc19025960f659b86d8d989b8b2db22010c9ebfd Author: Jarek Potiuk <jarek.pot...@polidea.com> AuthorDate: Sat Nov 7 12:18:14 2020 +0100 Fixes undefined variables (#12155) There are few more variables that (if not defined) prevent from using the CI image directly without breeze or the CI scripts. With this change you can run: `docker run -it apache/airflow:master-python3.6-ci` and enter the image without errors. (cherry picked from commit c7f34104516095c487cd6729f830df373ab78fbd) --- scripts/ci/libraries/_initialization.sh | 4 ++-- scripts/in_container/entrypoint_ci.sh | 2 +- scripts/in_container/run_init_script.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/ci/libraries/_initialization.sh b/scripts/ci/libraries/_initialization.sh index e0b4a8a..b58fa2e 100644 --- a/scripts/ci/libraries/_initialization.sh +++ b/scripts/ci/libraries/_initialization.sh @@ -566,10 +566,10 @@ Detected CI build environment: Initialization variables: - INIT_SCRIPT_FILE: ${INIT_SCRIPT_FILE} + INIT_SCRIPT_FILE: ${INIT_SCRIPT_FILE=} LOAD_DEFAULT_CONNECTIONS: ${LOAD_DEFAULT_CONNECTIONS} LOAD_EXAMPLES: ${LOAD_EXAMPLES} - INSTALL_WHEELS: ${INSTALL_WHEELS} + INSTALL_WHEELS: ${INSTALL_WHEELS=} DISABLE_RBAC: ${DISABLE_RBAC} Test variables: diff --git a/scripts/in_container/entrypoint_ci.sh b/scripts/in_container/entrypoint_ci.sh index 8a7b683..37d3199 100755 --- a/scripts/in_container/entrypoint_ci.sh +++ b/scripts/in_container/entrypoint_ci.sh @@ -97,7 +97,7 @@ else install_released_airflow_version "${INSTALL_AIRFLOW_VERSION}" fi -if [[ ${INSTALL_WHEELS} == "true" ]]; then +if [[ ${INSTALL_WHEELS=} == "true" ]]; then pip install /dist/*.whl || true fi diff --git a/scripts/in_container/run_init_script.sh b/scripts/in_container/run_init_script.sh index a4b030a..0bd685c 100755 --- a/scripts/in_container/run_init_script.sh +++ b/scripts/in_container/run_init_script.sh @@ -23,7 +23,7 @@ if [ -z "${AIRFLOW_BREEZE_CONFIG_DIR+x}" ]; then export AIRFLOW_BREEZE_CONFIG_DIR="${FILES_DIR}/airflow-breeze-config" fi -if [ -z "${INIT_SCRIPT_FILE}" ]; then +if [ -z "${INIT_SCRIPT_FILE=}" ]; then export INIT_SCRIPT_FILE="init.sh" fi