avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-06-06 07:35:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert

Browse Source
This commit is contained in:
alexbelgium
2025-05-28 10:33:09 +02:00
parent 197f55fa9c
commit e0a0da019b
2 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
postgres/Dockerfile
View File

@@ -54,7 +54,7 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh
# Manual apps # Manual apps
ENV PACKAGES="jq" ENV PACKAGES=""
# Automatic apps & bashio # Automatic apps & bashio
ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh" ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh"

93
postgres/rootfs/etc/cont-init.d/99-run.sh
View File

@@ -9,7 +9,7 @@ set -e
CONFIG_HOME="/config" CONFIG_HOME="/config"
PGDATA="${PGDATA:-/config/database}" PGDATA="${PGDATA:-/config/database}"
PG_VERSION_FILE="$PGDATA/pg_major_version" PG_VERSION_FILE="$PGDATA/pg_major_version"
VCHORD_VERSION_FILE="$PGDATA/vchord_version" VECTOR_VERSION_FILE="$PGDATA/pgvector_version"
# Define current PostgreSQL major version # Define current PostgreSQL major version
PG_MAJOR_VERSION="${PG_MAJOR:-15}" PG_MAJOR_VERSION="${PG_MAJOR:-15}"
@@ -46,11 +46,11 @@ cd /config || true
bashio::log.info "Starting PostgreSQL..." bashio::log.info "Starting PostgreSQL..."
if [ "$(bashio::info.arch)" = "armv7" ]; then if [ "$(bashio::info.arch)" = "armv7" ]; then
bashio::log.warning "ARMv7 detected: Starting without extensions" bashio::log.warning "ARMv7 detected: Starting without vectors.so"
immich-docker-entrypoint.sh postgres & true docker-entrypoint.sh postgres & true
exit 0 exit 0
else else
immich-docker-entrypoint.sh postgres -c config_file=/etc/postgresql/postgresql.conf & true docker-entrypoint.sh postgres -c shared_preload_libraries=vectors.so -c search_path="public, vectors" & true
fi fi
############################### ###############################
@@ -96,7 +96,7 @@ update_postgres() {
# Install binaries # Install binaries
apt-get update &>/dev/null apt-get update &>/dev/null
install -y procps rsync postgresql-"$PG_MAJOR_VERSION" postgresql-"$OLD_PG_VERSION" &>/dev/null install -y procps rsync postgresql-$PG_MAJOR_VERSION postgresql-$OLD_PG_VERSION &>/dev/null
# Download and run the upgrade script # Download and run the upgrade script
TMP_SCRIPT=$(mktemp) TMP_SCRIPT=$(mktemp)
@@ -110,66 +110,65 @@ update_postgres() {
} }
##################################### #####################################
# Enable & Upgrade vchord # # Enable & Upgrade pgvector.rs #
##################################### #####################################
# Function: Check if 'vchord' extension is enabled # Function: Check if 'vectors' extension is enabled
check_vchord_extension() { check_vector_extension() {
bashio::log.info "Checking if 'vchord' extension is enabled..." bashio::log.info "Checking if 'vectors' extension is enabled..."
local result local result
result=$(psql "postgres://$DB_USERNAME:$DB_PASSWORD@$DB_HOSTNAME:$DB_PORT" \ result=$(psql "postgres://$DB_USERNAME:$DB_PASSWORD@$DB_HOSTNAME:$DB_PORT" \
-tAc "SELECT extname FROM pg_extension WHERE extname = 'vchord';") -tAc "SELECT extname FROM pg_extension WHERE extname = 'vectors';")
if [[ "$result" == "vchord" ]]; then if [[ "$result" == "vectors" ]]; then
bashio::log.info "'vchord' extension is enabled." bashio::log.info "'vectors' extension is enabled."
return 0 return 0
else else
bashio::log.error "'vchord' extension is NOT enabled." bashio::log.error "'vectors' extension is NOT enabled."
return 1 return 1
fi fi
} }
# Function: Enable (or re-create) 'vchord' extension # Function: Enable (or re-create) 'vectors' extension
enable_vchord_extension() { enable_vector_extension() {
bashio::log.info "Enabling 'vchord' extension..." bashio::log.info "Enabling 'vectors' extension..."
psql "postgres://$DB_USERNAME:$DB_PASSWORD@$DB_HOSTNAME:$DB_PORT" -c "DROP EXTENSION IF EXISTS vchord;" >/dev/null 2>&1 psql "postgres://$DB_USERNAME:$DB_PASSWORD@$DB_HOSTNAME:$DB_PORT" -c "DROP EXTENSION IF EXISTS vectors; CREATE EXTENSION vectors;" >/dev/null 2>&1
psql "postgres://$DB_USERNAME:$DB_PASSWORD@$DB_HOSTNAME:$DB_PORT" -c "CREATE EXTENSION vchord;" >/dev/null 2>&1 psql "postgres://$DB_USERNAME:$DB_PASSWORD@$DB_HOSTNAME:$DB_PORT" -c "ALTER EXTENSION vectors UPDATE; SELECT pgvectors_upgrade();" >/dev/null 2>&1
psql "postgres://$DB_USERNAME:$DB_PASSWORD@$DB_HOSTNAME:$DB_PORT" -c "ALTER EXTENSION vchord UPDATE;" >/dev/null 2>&1
} }
# Function: Store the current vchord version in a file # Function: Store the current pgvector.rs version in a file
store_vchord_version() { store_vector_version() {
local version local version
version=$(psql "postgres://$DB_USERNAME:$DB_PASSWORD@$DB_HOSTNAME:$DB_PORT" \ version=$(psql "postgres://$DB_USERNAME:$DB_PASSWORD@$DB_HOSTNAME:$DB_PORT" \
-tAc "SELECT extversion FROM pg_extension WHERE extname = 'vchord';") -tAc "SELECT extversion FROM pg_extension WHERE extname = 'vectors';")
echo "$version" > "$VCHORD_VERSION_FILE" echo "$version" > "$VECTOR_VERSION_FILE"
} }
# Function: Detect previous and new vchord versions, and upgrade if needed # Function: Detect previous and new pgvector.rs versions, and upgrade if needed
upgrade_vchord_extension() { upgrade_vector_extension() {
local current_version desired_version local current_version desired_version
current_version=$(cat "$VCHORD_VERSION_FILE" 2>/dev/null || echo "unknown") current_version=$(cat "$VECTOR_VERSION_FILE" 2>/dev/null || echo "unknown")
desired_version=$(psql "postgres://$DB_USERNAME:$DB_PASSWORD@$DB_HOSTNAME:$DB_PORT" \ desired_version=$(psql "postgres://$DB_USERNAME:$DB_PASSWORD@$DB_HOSTNAME:$DB_PORT" \
-tAc "SELECT extversion FROM pg_extension WHERE extname = 'vchord';") -tAc "SELECT extversion FROM pg_extension WHERE extname = 'vectors';")
if [[ "$current_version" != "$desired_version" ]]; then if [[ "$current_version" != "$desired_version" ]]; then
bashio::log.warning "Upgrading 'vchord' extension from version $current_version → $desired_version..." bashio::log.warning "Upgrading 'vectors' extension from version $current_version → $desired_version..."
psql "postgres://$DB_USERNAME:$DB_PASSWORD@$DB_HOSTNAME@$DB_PORT" -c "ALTER EXTENSION vchord UPDATE;" >/dev/null 2>&1 psql "postgres://$DB_USERNAME:$DB_PASSWORD@$DB_HOSTNAME:$DB_PORT" -c "ALTER EXTENSION vectors UPDATE;" >/dev/null 2>&1
# Cleanup outdated indexes if needed (customize this line as needed for your DB schema) # Cleanup outdated indexes
bashio::log.info "Cleaning up outdated vector indexes (if any)..." bashio::log.info "Cleaning up outdated vector indexes..."
psql "postgres://$DB_USERNAME:$DB_PASSWORD@$DB_HOSTNAME:$DB_PORT" \ psql "postgres://$DB_USERNAME:$DB_PASSWORD@$DB_HOSTNAME:$DB_PORT" \
-c "DROP INDEX IF EXISTS clip_index;" >/dev/null 2>&1 -c "DROP INDEX IF EXISTS clip_index;" >/dev/null 2>&1
# Store new vchord version # Store new pgvector version
echo "$desired_version" > "$VCHORD_VERSION_FILE" echo "$desired_version" > "$VECTOR_VERSION_FILE"
else else
bashio::log.info "'vchord' extension is already at the latest version ($desired_version)." bashio::log.info "'vectors' extension is already at the latest version ($desired_version)."
fi fi
} }
# Function: Troubleshoot vchord extension # Function: Troubleshoot vector extension
troubleshoot_vchord_extension() { troubleshoot_vector_extension() {
bashio::log.error "Troubleshooting vchord installation..." bashio::log.error "Troubleshooting pgvector.rs installation..."
if ! pg_isready -h "$DB_HOSTNAME" -p "$DB_PORT" -U "$DB_USERNAME" >/dev/null 2>&1; then if ! pg_isready -h "$DB_HOSTNAME" -p "$DB_PORT" -U "$DB_USERNAME" >/dev/null 2>&1; then
bashio::log.error "PostgreSQL is not running or unreachable." bashio::log.error "PostgreSQL is not running or unreachable."
@@ -178,9 +177,9 @@ troubleshoot_vchord_extension() {
local ext_check local ext_check
ext_check=$(psql "postgres://$DB_USERNAME:$DB_PASSWORD@$DB_HOSTNAME:$DB_PORT" \ ext_check=$(psql "postgres://$DB_USERNAME:$DB_PASSWORD@$DB_HOSTNAME:$DB_PORT" \
-tAc "SELECT count(*) FROM pg_available_extensions WHERE name = 'vchord';") -tAc "SELECT count(*) FROM pg_available_extensions WHERE name = 'vectors';")
if [[ "$ext_check" -eq 0 ]]; then if [[ "$ext_check" -eq 0 ]]; then
bashio::log.error "'vchord' extension is missing. Ensure vchord is installed. If this is your first boot it will be installed later" bashio::log.error "'vectors' extension is missing. Ensure pgvector.rs is installed."
exit 1 exit 1
fi fi
} }
@@ -189,20 +188,20 @@ troubleshoot_vchord_extension() {
# Main Extension Handling # # Main Extension Handling #
################################### ###################################
# Store previous vchord version # Store previous vector version
update_postgres update_postgres
if ! check_vchord_extension; then if ! check_vector_extension; then
enable_vchord_extension enable_vector_extension
fi fi
# Store previous vchord version # Store previous vector version
store_vchord_version store_vector_version
# Upgrade vchord extension if needed # Upgrade vector extension if needed
upgrade_vchord_extension upgrade_vector_extension
# Final verification # Final verification
check_vchord_extension || troubleshoot_vchord_extension check_vector_extension || troubleshoot_vector_extension
bashio::log.info "All initialization steps completed successfully!" ) & true bashio::log.info "All initialization steps completed successfully!" ) & true