Merge pull request #15964 from Security-Onion-Solutions/reyesj2-patch-8

use pipe exit status for update_docker_containers
This commit is contained in:
Jorge Reyes
2026-06-09 13:49:24 -05:00
committed by GitHub
2 changed files with 6 additions and 1 deletions
+2
View File
@@ -980,6 +980,8 @@ docker_seed_registry() {
docker_seed_update_percent=25
update_docker_containers 'netinstall' '' 'docker_seed_update' '/dev/stdout' 2>&1 | tee -a "$setup_log"
# Use pipe exit status of 'update_docker_containers' for return code
return ${PIPESTATUS[0]}
fi
}
+4 -1
View File
@@ -767,7 +767,10 @@ if ! [[ -f $install_opt_file ]]; then
title "Applying the registry state"
logCmd "salt-call state.apply -l info registry"
title "Seeding the docker registry"
docker_seed_registry
if ! docker_seed_registry; then
error "Failed to seed the docker registry"
fail_setup
fi
title "Applying the manager state"
logCmd "salt-call state.apply -l info manager"
logCmd "salt-call state.apply influxdb -l info"