Skip to content

Initialize custom variables before running db-reset #54324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 1 commit into from
Aug 10, 2025
Merged

Initialize custom variables before running db-reset #54324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions scripts/docker/entrypoint_ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
5 changes: 0 additions & 5 deletions scripts/in_container/check_environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 $?
}
Expand Down
Loading