From 49ba55ef8b95e776393e08571e1997ffbe63b8b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20B=C3=BCrk?= Date: Sun, 27 Sep 2026 10:18:15 +0200 Subject: [PATCH] [TASK] DPL-238: Pass CI_PARAMS to docker containers The runner reads CI_PARAMS from the environment to pass additional options to "docker run", but only the podman branch used it. With docker the variable was silently ignored, so there was no way to hand e.g. COMPOSER_AUTH into the containers without editing the script. The docker branch now adds it at the same place as the podman branch. Without CI_PARAMS the generated commands are unchanged. Refs: DPL-238 --- Build/Scripts/runTests.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh index 8e0bda5..dc26cba 100755 --- a/Build/Scripts/runTests.sh +++ b/Build/Scripts/runTests.sh @@ -493,9 +493,9 @@ ${CONTAINER_BIN} network create ${NETWORK} >/dev/null if [ "${CONTAINER_BIN}" == "docker" ]; then # docker needs the add-host for xdebug remote debugging. podman has host.container.internal built in - CONTAINER_COMMON_PARAMS="${CONTAINER_INTERACTIVE} --rm --network ${NETWORK} --add-host ${CONTAINER_HOST}:host-gateway ${USERSET} -v ${ROOT_DIR}:${ROOT_DIR} -w ${ROOT_DIR}" - CONTAINER_SIMPLE_PARAMS="${CONTAINER_INTERACTIVE} --rm --network ${NETWORK} --add-host ${CONTAINER_HOST}:host-gateway ${USERSET} -v ${ROOT_DIR}:${ROOT_DIR} -w ${ROOT_DIR}" - DOCUMENTATION_COMMON_PARAMS="${CONTAINER_INTERACTIVE} --rm ${USERSET} -v ${ROOT_DIR}:/project" + CONTAINER_COMMON_PARAMS="${CONTAINER_INTERACTIVE} ${CI_PARAMS} --rm --network ${NETWORK} --add-host ${CONTAINER_HOST}:host-gateway ${USERSET} -v ${ROOT_DIR}:${ROOT_DIR} -w ${ROOT_DIR}" + CONTAINER_SIMPLE_PARAMS="${CONTAINER_INTERACTIVE} ${CI_PARAMS} --rm --network ${NETWORK} --add-host ${CONTAINER_HOST}:host-gateway ${USERSET} -v ${ROOT_DIR}:${ROOT_DIR} -w ${ROOT_DIR}" + DOCUMENTATION_COMMON_PARAMS="${CONTAINER_INTERACTIVE} ${CI_PARAMS} --rm ${USERSET} -v ${ROOT_DIR}:/project" # docker creates a tmpfs owned by "root:root", inheriting the mode of its host # mountpoint, while "${USERSET}" above passes a uid but no group and therefore runs # the container as "uid=${HOST_UID} gid=0". At a CI umask of 0022 the mountpoint is