[airflow] branch main updated: Fix failing exec in Breeze (#22623)

[po...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new 91c958d  Fix failing exec in Breeze (#22623)
91c958d is described below

commit 91c958d85cbe323013f544b919d2ac479442d701
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Wed Mar 30 18:24:22 2022 +0200

    Fix failing exec in Breeze (#22623)
---
 .pre-commit-config.yaml           | 2 +-
 Dockerfile.ci                     | 4 ++--
 scripts/docker/entrypoint_exec.sh | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index baf00cd..f0c1f03 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -702,7 +702,7 @@ repos:
         entry: ./scripts/ci/pre_commit/pre_commit_inline_scripts_in_docker.py
         language: python
         pass_filenames: false
-        files: ^Dockerfile$|^Dockerfile.ci|scripts/ci/docker/.*$
+        files: ^Dockerfile$|^Dockerfile.ci|^scripts/docker/.*$
         require_serial: true
       - id: ui-lint
         name: ESLint against airflow/ui
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 62cc70b..5ffabde 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1328,9 +1328,9 @@ COPY <<"EOF" entrypoint_exec.sh
 #!/usr/bin/env bash
 . /opt/airflow/scripts/in_container/_in_container_script_init.sh
 
-. "$( dirname "${BASH_SOURCE[0]}" )/configure_environment.sh"
+. /opt/airflow/scripts/in_container/configure_environment.sh
 
-. "$( dirname "${BASH_SOURCE[0]}" )/run_init_script.sh"
+. /opt/airflow/scripts/in_container/run_init_script.sh
 
 exec /bin/bash "${@}"
 EOF
diff --git a/scripts/docker/entrypoint_exec.sh b/scripts/docker/entrypoint_exec.sh
index cb0e3c8..431a91d 100755
--- a/scripts/docker/entrypoint_exec.sh
+++ b/scripts/docker/entrypoint_exec.sh
@@ -19,9 +19,9 @@
 . /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"
+. /opt/airflow/scripts/in_container/configure_environment.sh
 
 # shellcheck source=scripts/in_container/run_init_script.sh
-. "$( dirname "${BASH_SOURCE[0]}" )/run_init_script.sh"
+. /opt/airflow/scripts/in_container/run_init_script.sh
 
 exec /bin/bash "${@}"