diff --git a/Jenkinsfile b/Jenkinsfile index fd249ff..0e5214a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,13 +40,7 @@ pipeline { stage('Compose validate') { steps { - sh ''' - source .ci-bin/ci-env.sh - mkdir -p dist - sed '/exclude_from_hc:/d' docker-compose.yml > dist/docker-compose.coolify.yml - $COMPOSE -f dist/docker-compose.coolify.yml config -q - echo "Coolify-safe compose validates" - ''' + sh 'bash scripts/ci/jenkins-compose-validate.sh' } } diff --git a/scripts/ci/jenkins-compose-validate.sh b/scripts/ci/jenkins-compose-validate.sh new file mode 100755 index 0000000..06811a5 --- /dev/null +++ b/scripts/ci/jenkins-compose-validate.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +set -euo pipefail + +# shellcheck source=/dev/null +source .ci-bin/ci-env.sh + +mkdir -p dist +sed '/exclude_from_hc:/d' docker-compose.yml > dist/docker-compose.coolify.yml +$COMPOSE -f dist/docker-compose.coolify.yml config -q +echo "Coolify-safe compose validates" diff --git a/scripts/ci/jenkins-run.sh b/scripts/ci/jenkins-run.sh index 78f9198..0b010a8 100755 --- a/scripts/ci/jenkins-run.sh +++ b/scripts/ci/jenkins-run.sh @@ -9,10 +9,5 @@ chmod +x scripts/ci/*.sh bash scripts/ci/ci-readiness.sh . bash scripts/ci/validate-docker-compose.sh . bash scripts/ci/jenkins-bootstrap.sh - -# shellcheck source=/dev/null -source .ci-bin/ci-env.sh -mkdir -p dist -sed '/exclude_from_hc:/d' docker-compose.yml > dist/docker-compose.coolify.yml -$COMPOSE -f dist/docker-compose.coolify.yml config -q +bash scripts/ci/jenkins-compose-validate.sh bash scripts/ci/jenkins-pull-image.sh