Fix API CI failures

This commit is contained in:
Jeppe Bundgaard
2026-07-02 10:42:13 +02:00
parent 1d1ebd2176
commit 248b2e4eca
7 changed files with 112 additions and 12 deletions
+2 -6
View File
@@ -18,6 +18,7 @@ cd "$repo_root"
compose_files="-f docker-compose.yml -f .github/docker-compose.ci.yml"
project_suffix="$(date +%s)-$$"
export COMPOSE_PROJECT_NAME="${COMPOSE_PROJECT_NAME:-php-local-${suite}-${project_suffix}}"
export COMPOSE_PROFILES="${COMPOSE_PROFILES:-dev}"
log_dir=".tmp/ci-logs/$suite"
mkdir -p "$log_dir"
@@ -84,10 +85,6 @@ composer_install() {
'cd /var/www/html && composer install --no-interaction --prefer-source --no-progress'
}
prune_unused_docker_networks() {
docker network prune -f >/dev/null 2>&1 || true
}
configure_ci_docker_subnet() {
if [ -n "${CI_DOCKER_SUBNET:-}" ]; then
return
@@ -119,8 +116,7 @@ cleanup() {
trap cleanup EXIT INT TERM
configure_ci_docker_subnet
prune_unused_docker_networks
retry_command "${PHP_CI_DOCKER_RETRIES:-3}" docker compose $compose_files up -d redis mysql-debug php1
sh scripts/ci-docker-compose-up.sh redis mysql-debug php1
docker compose $compose_files exec -T php1 sh -lc '
set -eu