mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2026-06-14 22:28:43 +02:00
fix so-soc postgres bootstrap
This commit is contained in:
@@ -730,12 +730,17 @@ bootstrap_so_soc_database() {
|
|||||||
# 3.1.0 already have /nsm/postgres populated, so the so_soc bootstrap block
|
# 3.1.0 already have /nsm/postgres populated, so the so_soc bootstrap block
|
||||||
# added in 3.2 never fires. Re-run the script explicitly; it's idempotent.
|
# added in 3.2 never fires. Re-run the script explicitly; it's idempotent.
|
||||||
echo "Bootstrapping so_soc database via init-db.sh."
|
echo "Bootstrapping so_soc database via init-db.sh."
|
||||||
|
# The postgres image has no USER directive, so `docker exec` defaults to
|
||||||
|
# root, and the container env intentionally omits POSTGRES_USER (the upstream
|
||||||
|
# entrypoint defaults it transiently during first-init only). Recreate both
|
||||||
|
# so psql inside init-db.sh resolves the connect user correctly.
|
||||||
|
local exec_cmd="docker exec -u postgres -e POSTGRES_USER=postgres so-postgres bash /docker-entrypoint-initdb.d/init-db.sh"
|
||||||
if ! /usr/sbin/so-postgres-wait; then
|
if ! /usr/sbin/so-postgres-wait; then
|
||||||
FINAL_MESSAGE_QUEUE+=("WARNING: so-postgres was not ready during the 3.2.0 upgrade; the so_soc database may not have been bootstrapped. Re-run manually: docker exec so-postgres bash /docker-entrypoint-initdb.d/init-db.sh")
|
FINAL_MESSAGE_QUEUE+=("WARNING: so-postgres was not ready during the 3.2.0 upgrade; the so_soc database may not have been bootstrapped. Re-run manually: $exec_cmd")
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
if ! docker exec so-postgres bash /docker-entrypoint-initdb.d/init-db.sh; then
|
if ! $exec_cmd; then
|
||||||
FINAL_MESSAGE_QUEUE+=("WARNING: init-db.sh failed inside so-postgres during the 3.2.0 upgrade; the so_soc database may not have been bootstrapped. Re-run manually: docker exec so-postgres bash /docker-entrypoint-initdb.d/init-db.sh")
|
FINAL_MESSAGE_QUEUE+=("WARNING: init-db.sh failed inside so-postgres during the 3.2.0 upgrade; the so_soc database may not have been bootstrapped. Re-run manually: $exec_cmd")
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
echo "so_soc bootstrap complete."
|
echo "so_soc bootstrap complete."
|
||||||
|
|||||||
Reference in New Issue
Block a user