-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix compatibility issues with docker-compose 2 (#18725)
Docker-compose 2 on linux introduced a number of problems and incompatibilities: * version is printed in different format * -f flag was failing after --log-level info was passed * environment variables were not correctly passed with _docker.env with missing values All those worked fine in 1.29.2 and even in MacOS version of docker-compose 2 (after raising and fixing some bugs by us docker-archive/compose-cli#1917 This PR: * fixes version regexp * removes --log-level info * adds copy of _docker.env with var="${var} assignments specifically for docker-compose (duplicated variables but this works as a workaround) GitOrigin-RevId: 2630341d0f5088215798719a5418a3e77abbc5c7
- Loading branch information
Showing
4 changed files
with
52 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
AIRFLOW_CI_IMAGE="${AIRFLOW_CI_IMAGE}" | ||
AIRFLOW_EXTRAS="${AIRFLOW_EXTRAS}" | ||
BACKEND="${BACKEND}" | ||
BREEZE="${BREEZE}" | ||
CI="${CI}" | ||
CI_BUILD_ID="${CI_BUILD_ID}" | ||
CI_JOB_ID="${CI_JOB_ID}" | ||
CI_EVENT_TYPE="${CI_EVENT_TYPE}" | ||
CI_TARGET_REPO="${CI_TARGET_REPO}" | ||
CI_TARGET_BRANCH="${CI_TARGET_BRANCH}" | ||
COMMIT_SHA="${COMMIT_SHA}" | ||
DB_RESET="${DB_RESET}" | ||
DEFAULT_BRANCH="${DEFAULT_BRANCH}" | ||
DEFAULT_CONSTRAINTS_BRANCH="${DEFAULT_CONSTRAINTS_BRANCH}" | ||
ENABLED_INTEGRATIONS="${ENABLED_INTEGRATIONS}" | ||
ENABLED_SYSTEMS="${ENABLED_SYSTEMS}" | ||
GITHUB_ACTIONS="${GITHUB_ACTIONS}" | ||
GITHUB_REGISTRY_PULL_IMAGE_TAG="${GITHUB_REGISTRY_PULL_IMAGE_TAG}" | ||
HOST_USER_ID="${HOST_USER_ID}" | ||
HOST_GROUP_ID="${HOST_GROUP_ID}" | ||
HOST_OS="${HOST_OS}" | ||
HOST_HOME="${HOST_HOME}" | ||
INIT_SCRIPT_FILE="${INIT_SCRIPT_FILE}" | ||
INSTALL_AIRFLOW_VERSION="${INSTALL_AIRFLOW_VERSION}" | ||
GENERATE_CONSTRAINTS_MODE="${GENERATE_CONSTRAINTS_MODE}" | ||
INSTALL_PROVIDERS_FROM_SOURCES="${INSTALL_PROVIDERS_FROM_SOURCES}" | ||
USE_AIRFLOW_VERSION="${USE_AIRFLOW_VERSION}" | ||
USE_PACKAGES_FROM_DIST="${USE_PACKAGES_FROM_DIST}" | ||
ISSUE_ID="${ISSUE_ID}" | ||
LOAD_DEFAULT_CONNECTIONS="${LOAD_DEFAULT_CONNECTIONS}" | ||
LOAD_EXAMPLES="${LOAD_EXAMPLES}" | ||
MYSQL_VERSION="${MYSQL_VERSION}" | ||
NUM_RUNS="${NUM_RUNS}" | ||
PACKAGE_FORMAT="${PACKAGE_FORMAT}" | ||
POSTGRES_VERSION="${POSTGRES_VERSION}" | ||
PRINT_INFO_FROM_SCRIPTS="${PRINT_INFO_FROM_SCRIPTS}" | ||
PYTHONDONTWRITEBYTECODE="${PYTHONDONTWRITEBYTECODE}" | ||
PYTHON_MAJOR_MINOR_VERSION="${PYTHON_MAJOR_MINOR_VERSION}" | ||
RUN_TESTS="${RUN_TESTS}" | ||
RUN_INTEGRATION_TESTS="${RUN_INTEGRATION_TESTS}" | ||
RUN_SYSTEM_TESTS="${RUN_SYSTEM_TESTS}" | ||
START_AIRFLOW="${START_AIRFLOW}" | ||
TEST_TYPE="${TEST_TYPE}" | ||
UPGRADE_TO_NEWER_DEPENDENCIES="${UPGRADE_TO_NEWER_DEPENDENCIES}" | ||
VERBOSE="${VERBOSE}" | ||
VERBOSE_COMMANDS="${VERBOSE_COMMANDS}" | ||
VERSION_SUFFIX_FOR_PYPI="${VERSION_SUFFIX_FOR_PYPI}" | ||
VERSION_SUFFIX_FOR_SVN="${VERSION_SUFFIX_FOR_SVN}" | ||
WHEEL_VERSION="${WHEEL_VERSION}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters