Skip to content

Commit

Permalink
refs #3233: If a custom configuration file is found, use it (#240)
Browse files Browse the repository at this point in the history
* refs #3233: If a custom configuration file is found, use it

* refs #3233: If a custom configuration file is found, use it

* refs #3233: If a custom configuration file is found, use it

* refs #3233: If a custom configuration file is found, use it
  • Loading branch information
paolomainardi authored Nov 5, 2024
1 parent dc25087 commit 00ed93e
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions templates/.gitlab-ci-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ variables:
if command -v docker &> /dev/null; then
section_start "docker" "Configure Docker services"
if [ -f /tmp/.docker/config.custom.json ]; then
echo "Custom Docker configuration found, copying it to /root/.docker/config.json"
cp /tmp/.docker/config.custom.json /root/.docker/config.json
fi
for i in $(seq 1 30); do
docker info && break
echo "Waiting for docker to start..."
Expand All @@ -102,7 +108,7 @@ variables:
if command -v docker-compose &> /dev/null; then
docker-compose version
fi
section_end "docker"
fi
Expand Down Expand Up @@ -138,7 +144,7 @@ variables:
# Handle debug sleep.
section_start "debug-sleep" "Print debug information"
print_debug_sleep_help
# Default to 1 hour if not set
DEBUG_JOB_SLEEP_SECONDS="${DEBUG_JOB_SLEEP_SECONDS:-3600}"
if [ "${DEBUG_JOB_SLEEP}" = "1" ] && [ "${DEBUG_JOB_SLEEP_JOB_NAME}" = "${CI_JOB_NAME_SLUG}" ]; then
Expand Down

0 comments on commit 00ed93e

Please sign in to comment.