avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-05-28 11:24:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update 99-run.sh

Browse Source
This commit is contained in:
Alexandre
2025-07-16 16:16:04 +02:00
committed by GitHub
parent 0fef52421b
commit 9d487fb617
1 changed files with 95 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

187
ente/rootfs/etc/cont-init.d/99-run.sh
View File

@@ -8,7 +8,7 @@ set -euo pipefail
mkdir -p /config/ente/custom-logs mkdir -p /config/ente/custom-logs
mkdir -p /config/data mkdir -p /config/data
mkdir -p /config/minio-data mkdir -p /config/minio-data
mkdir -p /config/postgres mkdir -p /config/postgres-data
mkdir -p /config/scripts/compose mkdir -p /config/scripts/compose
############################################ ############################################
@@ -16,7 +16,7 @@ mkdir -p /config/scripts/compose
############################################ ############################################
USE_EXTERNAL_DB=false USE_EXTERNAL_DB=false
if bashio::config.true 'USE_EXTERNAL_DB'; then if bashio::config.true 'USE_EXTERNAL_DB'; then
USE_EXTERNAL_DB=true USE_EXTERNAL_DB=true
fi fi
DB_NAME="$(bashio::config 'DB_DATABASE_NAME')" DB_NAME="$(bashio::config 'DB_DATABASE_NAME')"
@@ -34,7 +34,7 @@ S3_BUCKET="$(bashio::config 'S3_BUCKET')"
DISABLE_WEB_UI=false DISABLE_WEB_UI=false
if bashio::config.true 'DISABLE_WEB_UI'; then if bashio::config.true 'DISABLE_WEB_UI'; then
DISABLE_WEB_UI=true DISABLE_WEB_UI=true
fi fi
############################################ ############################################
@@ -47,126 +47,129 @@ MC_BIN="/usr/local/bin/mc"
MUSEUM_BIN="/usr/bin/museum" MUSEUM_BIN="/usr/bin/museum"
WEB_BIN="/usr/bin/ente-web" WEB_BIN="/usr/bin/ente-web"
PGDATA="/config/postgres" # unify PGDATA
PGDATA="/config/postgres-data"
############################################ ############################################
# Functions # Functions
############################################ ############################################
start_postgres() { start_postgres() {
if $USE_EXTERNAL_DB; then if $USE_EXTERNAL_DB; then
bashio::log.info "External DB enabled; skipping internal Postgres start." bashio::log.info "External DB enabled; skipping internal Postgres start."
return 0 return 0
fi fi
# runtime socket dir # runtime socket dir
mkdir -p /run/postgresql mkdir -p /run/postgresql
chown postgres:postgres /run/postgresql chown postgres:postgres /run/postgresql
chmod 775 /run/postgresql chmod 775 /run/postgresql
# data dir # data dir
mkdir -p "$PGDATA" mkdir -p "$PGDATA"
chown -R postgres:postgres "$PGDATA" chown -R postgres:postgres "$PGDATA"
chmod 0700 "$PGDATA" chmod 0700 "$PGDATA"
if [[ ! -s "$PGDATA/PG_VERSION" ]]; then if [[ ! -s "$PGDATA/PG_VERSION" ]]; then
bashio::log.info "Initializing Postgres data directory..." bashio::log.info "Initializing Postgres data directory..."
su - postgres -c "$INITDB -D $PGDATA" su - postgres -c "$INITDB -D $PGDATA"
fi fi
bashio::log.info "Starting Postgres (127.0.0.1:5432)..." bashio::log.info "Starting Postgres (127.0.0.1:5432)..."
# background so startup can continue su - postgres -c "$POSTGRES_BIN -D $PGDATA -c listen_addresses='127.0.0.1'" &
su - postgres -c "$POSTGRES_BIN -D $PGDATA -c listen_addresses='127.0.0.1'" & PG_PID=$!
PG_PID=$!
} }
wait_postgres_ready() { wait_postgres_ready() {
local host port user local host port user
if $USE_EXTERNAL_DB; then if $USE_EXTERNAL_DB; then
host="$DB_HOST_EXT" host="$DB_HOST_EXT"
port="$DB_PORT_EXT" port="$DB_PORT_EXT"
user="$DB_USER" user="$DB_USER"
bashio::log.info "Waiting for EXTERNAL Postgres at ${host}:${port}..." bashio::log.info "Waiting for EXTERNAL Postgres at ${host}:${port}..."
else else
host="$DB_HOST_INTERNAL" host="$DB_HOST_INTERNAL"
port="$DB_PORT_INTERNAL" port="$DB_PORT_INTERNAL"
# Use superuser 'postgres' for readiness check because DB_USER may not yet exist. user="postgres" # cluster superuser for initial readiness
user="postgres" bashio::log.info "Waiting for internal Postgres..."
bashio::log.info "Waiting for internal Postgres..." fi
fi until pg_isready -q -h "$host" -p "$port" -U "$user"; do
until pg_isready -q -h "$host" -p "$port" -U "$user"; do sleep 1
sleep 1 done
done bashio::log.info "Postgres reachable."
bashio::log.info "Postgres reachable."
} }
bootstrap_internal_db() { bootstrap_internal_db() {
if $USE_EXTERNAL_DB; then if $USE_EXTERNAL_DB; then
return 0 return 0
fi fi
bashio::log.info "Creating role/database if needed..."
# Use psql via local socket (faster, avoids password) # Escape single quotes in password for SQL
psql -v ON_ERROR_STOP=1 -h "$DB_HOST_INTERNAL" -p "$DB_PORT_INTERNAL" -U postgres <<SQL local esc_pass="${DB_PASS//\'/\'\'}"
DO \$\$
BEGIN
IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = '${DB_USER}') THEN
EXECUTE 'CREATE ROLE ${DB_USER} LOGIN PASSWORD ''' || replace('${DB_PASS}','''','''''') || '''';
END IF;
IF NOT EXISTS (SELECT 1 FROM pg_database WHERE datname = '${DB_NAME}') THEN
EXECUTE 'CREATE DATABASE ${DB_NAME} OWNER ${DB_USER}';
END IF;
END
\$\$;
SQL
bashio::log.info "Internal Postgres ready." bashio::log.info "Ensuring role ${DB_USER} exists..."
if ! su - postgres -c "psql -Atqc \"SELECT 1 FROM pg_roles WHERE rolname='${DB_USER}'\" postgres" | grep -q 1; then
su - postgres -c "psql -v ON_ERROR_STOP=1 -c \"CREATE ROLE \\\"${DB_USER}\\\" LOGIN PASSWORD '${esc_pass}'\" postgres"
else
# update password in case it changed
su - postgres -c "psql -v ON_ERROR_STOP=1 -c \"ALTER ROLE \\\"${DB_USER}\\\" PASSWORD '${esc_pass}'\" postgres"
fi
bashio::log.info "Ensuring database ${DB_NAME} exists (owner ${DB_USER})..."
if ! su - postgres -c "psql -Atqc \"SELECT 1 FROM pg_database WHERE datname='${DB_NAME}'\" postgres" | grep -q 1; then
su - postgres -c "createdb -O \"${DB_USER}\" \"${DB_NAME}\""
else
# make sure owner is correct
su - postgres -c "psql -v ON_ERROR_STOP=1 -c \"ALTER DATABASE \\\"${DB_NAME}\\\" OWNER TO \\\"${DB_USER}\\\"\" postgres"
fi
bashio::log.info "Internal Postgres ready."
} }
start_minio() { start_minio() {
bashio::log.info "Starting MinIO (:3200)..." bashio::log.info "Starting MinIO (:3200)..."
mkdir -p /config/minio-data mkdir -p /config/minio-data
"$MINIO_BIN" server /config/minio-data --address ":3200" & "$MINIO_BIN" server /config/minio-data --address ":3200" &
MINIO_PID=$! MINIO_PID=$!
} }
wait_minio_ready_and_bucket() { wait_minio_ready_and_bucket() {
bashio::log.info "Waiting for MinIO API..." bashio::log.info "Waiting for MinIO API..."
until "$MC_BIN" alias set h0 http://127.0.0.1:3200 "$MINIO_USER" "$MINIO_PASS" 2>/dev/null; do until "$MC_BIN" alias set h0 http://127.0.0.1:3200 "$MINIO_USER" "$MINIO_PASS" 2>/dev/null; do
sleep 1 sleep 1
done done
bashio::log.info "Ensuring bucket ${S3_BUCKET}..." bashio::log.info "Ensuring bucket ${S3_BUCKET}..."
"$MC_BIN" mb -p "h0/${S3_BUCKET}" || true "$MC_BIN" mb -p "h0/${S3_BUCKET}" || true
bashio::log.info "MinIO bucket ready." bashio::log.info "MinIO bucket ready."
} }
start_web() { start_web() {
if $DISABLE_WEB_UI; then if $DISABLE_WEB_UI; then
bashio::log.info "Web UI disabled." bashio::log.info "Web UI disabled."
return 0 return 0
fi fi
bashio::log.info "Starting Ente web (:3000)..." bashio::log.info "Starting Ente web (:3000)..."
"$WEB_BIN" & "$WEB_BIN" &
WEB_PID=$! WEB_PID=$!
} }
start_museum_foreground() { start_museum_foreground() {
local cfg=/config/museum.yaml local cfg=/config/museum.yaml
if ! bashio::fs.file_exists "$cfg"; then if ! bashio::fs.file_exists "$cfg"; then
bashio::log.error "$cfg missing; cannot start museum." bashio::log.error "$cfg missing; cannot start museum."
return 1 return 1
fi fi
# For internal DB: wait one more time as DB_USER (ensures role exists) # If internal DB, verify DB_USER can connect (role creation just happened)
if ! $USE_EXTERNAL_DB; then if ! $USE_EXTERNAL_DB; then
bashio::log.info "Verifying internal DB user '${DB_USER}'..." bashio::log.info "Verifying internal DB user '${DB_USER}' connectivity..."
until pg_isready -q -h "$DB_HOST_INTERNAL" -p "$DB_PORT_INTERNAL" -U "$DB_USER"; do until pg_isready -q -h "$DB_HOST_INTERNAL" -p "$DB_PORT_INTERNAL" -U "$DB_USER"; do
sleep 1 sleep 1
done done
fi fi
bashio::log.info "Starting museum (foreground)..." bashio::log.info "Starting museum (foreground)..."
exec "$MUSEUM_BIN" --config "$cfg" exec "$MUSEUM_BIN" --config "$cfg"
} }
############################################ ############################################
@@ -183,5 +186,5 @@ wait_minio_ready_and_bucket
start_web start_web
# Last: foreground museum keeps container alive # foreground: keeps container alive
start_museum_foreground start_museum_foreground