This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/master by this push:
new c7f3410 Fixes undefined variables (#12155)
c7f3410 is described below
commit c7f34104516095c487cd6729f830df373ab78fbd
Author: Jarek Potiuk <[email protected]>
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.
---
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 67dde8c..9bd8e34 100644
--- a/scripts/ci/libraries/_initialization.sh
+++ b/scripts/ci/libraries/_initialization.sh
@@ -570,10 +570,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 2b82dda..30e2db5 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