Fix Jenkins compose stage: avoid source under /bin/sh.

Jenkins sh steps use dash; move compose validation into a bash script like the other CI stages.
This commit is contained in:
epistemophiliac 2026-06-16 18:47:18 -04:00
parent f57072667c
commit 3eefb73727
3 changed files with 12 additions and 13 deletions

8
Jenkinsfile vendored
View file

@ -40,13 +40,7 @@ pipeline {
stage('Compose validate') { stage('Compose validate') {
steps { steps {
sh ''' sh 'bash scripts/ci/jenkins-compose-validate.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"
'''
} }
} }

View file

@ -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"

View file

@ -9,10 +9,5 @@ chmod +x scripts/ci/*.sh
bash scripts/ci/ci-readiness.sh . bash scripts/ci/ci-readiness.sh .
bash scripts/ci/validate-docker-compose.sh . bash scripts/ci/validate-docker-compose.sh .
bash scripts/ci/jenkins-bootstrap.sh bash scripts/ci/jenkins-bootstrap.sh
bash scripts/ci/jenkins-compose-validate.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-pull-image.sh bash scripts/ci/jenkins-pull-image.sh