This is an automated email from the ASF dual-hosted git repository. kaxilnaik pushed a commit to branch v1-10-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit a1584c253830934833eccf996b6804934c192ba2 Author: Jarek Potiuk <[email protected]> AuthorDate: Tue Dec 15 15:18:45 2020 +0100 fixup! fixup! Install airflow and providers from dist and verifies them (#13033) --- scripts/in_container/check_environment.sh | 6 +----- scripts/in_container/configure_environment.sh | 2 -- scripts/in_container/entrypoint_exec.sh | 4 ++++ 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/in_container/check_environment.sh b/scripts/in_container/check_environment.sh index 2282304..9ab400a 100755 --- a/scripts/in_container/check_environment.sh +++ b/scripts/in_container/check_environment.sh @@ -16,9 +16,6 @@ # specific language governing permissions and limitations # under the License. # Script to check licences for all code. Can be started from any working directory -# shellcheck source=scripts/in_container/_in_container_script_init.sh -. "$(dirname "${BASH_SOURCE[0]}")/_in_container_script_init.sh" - EXIT_CODE=0 DISABLED_INTEGRATIONS="" @@ -117,8 +114,6 @@ function startairflow_if_requested() { export AIRFLOW__CORE__LOAD_DEFAULT_CONNECTIONS=${LOAD_DEFAULT_CONNECTIONS} export AIRFLOW__CORE__LOAD_EXAMPLES=${LOAD_EXAMPLES} - . "$( dirname "${BASH_SOURCE[0]}" )/configure_environment.sh" - # initialize db and create the admin user if it's a new run if [[ ${RUN_AIRFLOW_1_10} == "true" ]]; then airflow initdb @@ -127,6 +122,7 @@ function startairflow_if_requested() { airflow create_user -u admin -p admin -f Thor -l Adminstra -r Admin -e [email protected] fi + # shellcheck source=scripts/in_container/run_init_script.sh . "$( dirname "${BASH_SOURCE[0]}" )/run_init_script.sh" fi diff --git a/scripts/in_container/configure_environment.sh b/scripts/in_container/configure_environment.sh index 4ec0d6a..3fe7858 100644 --- a/scripts/in_container/configure_environment.sh +++ b/scripts/in_container/configure_environment.sh @@ -17,8 +17,6 @@ # under the License. # Script to check licences for all code. Can be started from any working directory # shellcheck source=scripts/in_container/_in_container_script_init.sh -. "$( dirname "${BASH_SOURCE[0]}" )/_in_container_script_init.sh" - export FILES_DIR="/files" export AIRFLOW_BREEZE_CONFIG_DIR="${FILES_DIR}/airflow-breeze-config" VARIABLES_ENV_FILE="variables.env" diff --git a/scripts/in_container/entrypoint_exec.sh b/scripts/in_container/entrypoint_exec.sh index bce0bfc..728872b 100755 --- a/scripts/in_container/entrypoint_exec.sh +++ b/scripts/in_container/entrypoint_exec.sh @@ -15,6 +15,10 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. + +# shellcheck source=scripts/in_container/_in_container_script_init.sh +. /opt/airflow/scripts/in_container/_in_container_script_init.sh + # shellcheck source=scripts/in_container/configure_environment.sh . "$( dirname "${BASH_SOURCE[0]}" )/configure_environment.sh"
