Commit 5a7b28d2 authored by Emeric Verschuur's avatar Emeric Verschuur

Update docker run to use CITBX_JOB_SHELL

parent e9a2cd31
...@@ -862,8 +862,8 @@ case "$CITBX_JOB_EXECUTOR" in ...@@ -862,8 +862,8 @@ case "$CITBX_JOB_EXECUTOR" in
docker run --rm -ti --name="$CITBX_DOCKER_PREFIX-build" --hostname="$CITBX_DOCKER_PREFIX-build" \ docker run --rm -ti --name="$CITBX_DOCKER_PREFIX-build" --hostname="$CITBX_DOCKER_PREFIX-build" \
-e CI=true -e GITLAB_CI=true -v /var/run/docker.sock:/var/run/docker.sock \ -e CI=true -e GITLAB_CI=true -v /var/run/docker.sock:/var/run/docker.sock \
"${CITBX_DOCKER_RUN_ARGS[@]}" --label "$CITBX_DOCKER_PREFIX" "${CITBX_JOB_DOCKER_RUN_ARGS[@]}" \ "${CITBX_DOCKER_RUN_ARGS[@]}" --label "$CITBX_DOCKER_PREFIX" "${CITBX_JOB_DOCKER_RUN_ARGS[@]}" \
-e DOCKER_RUN_EXTRA_ARGS="$(bashopts_get_def bashopts_extra_args)" \ -e DOCKER_RUN_EXTRA_ARGS="$(bashopts_get_def bashopts_extra_args)" "${bashopts_extra_args[@]}" \
"${bashopts_extra_args[@]}" $CITBX_DOCKER_IMAGE "${CITBX_PRE_COMMANDS[@]}" sh -c "$CITBX_COMMANDS" $CITBX_DOCKER_IMAGE "${CITBX_PRE_COMMANDS[@]}" $CITBX_JOB_SHELL -c "$CITBX_COMMANDS"
;; ;;
*) *)
print_critical "Invalid or unsupported '$CITBX_JOB_EXECUTOR' executor" print_critical "Invalid or unsupported '$CITBX_JOB_EXECUTOR' executor"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment