Made the cron full vacum opt-in and also the schedule configurable

Author: Miggets7

Dockerfile

@@ -81,7 +81,10 @@ ENV PGROOT=/var/lib/postgresql \
     OR_REINDEX_COUNTER=${OR_REINDEX_COUNTER} \
     OR_DISABLE_REINDEX=${OR_DISABLE_REINDEX:-false} \
     POSTGRES_MAX_CONNECTIONS=${POSTGRES_MAX_CONNECTIONS:-50} \
-    OR_DISABLE_AUTO_UPGRADE=${OR_DISABLE_AUTO_UPGRADE:-false}
+    OR_DISABLE_AUTO_UPGRADE=${OR_DISABLE_AUTO_UPGRADE:-false} \
+    # VACUUM FULL settings (disabled by default)
+    OR_ENABLE_VACUUM_FULL=${OR_ENABLE_VACUUM_FULL:-false} \
+    OR_VACUUM_FULL_CRON_SCHEDULE="${OR_VACUUM_FULL_CRON_SCHEDULE:-'0 0 * * 0'}"
 
 WORKDIR /var/lib/postgresql
 EXPOSE 5432 8008 8081

Dockerfile.alpine

@@ -29,6 +29,10 @@ ENV POSTGRES_DB ${POSTGRES_DB:-openremote}
 ENV POSTGRES_USER ${POSTGRES_USER:-postgres}
 ENV POSTGRES_PASSWORD ${POSTGRES_PASSWORD:-postgres}
 
+# VACUUM FULL settings (disabled by default)
+ENV OR_ENABLE_VACUUM_FULL=${OR_ENABLE_VACUUM_FULL:-false}
+ENV OR_VACUUM_FULL_CRON_SCHEDULE="${OR_VACUUM_FULL_CRON_SCHEDULE:-'0 0 * * 0'}"
+
 # Add glibc and cron for scheduled VACUUM FULL operations
 RUN apk add --no-cache gcompat dcron
 

docker-entrypoint-initdb.d/200_or_setup_vacuum_full.sh

@@ -3,6 +3,14 @@
 # This script sets up a weekly VACUUM FULL job to clean up database bloat
 # VACUUM FULL reclaims more space than regular AUTOVACUUM by rewriting the entire table
 
+# Check if VACUUM FULL is enabled (default is disabled)
+if [ "${OR_ENABLE_VACUUM_FULL:-false}" != "true" ]; then
+    echo "VACUUM FULL is disabled (OR_ENABLE_VACUUM_FULL is not set to 'true'). Skipping setup."
+    exit 0
+fi
+
+echo "Setting up VACUUM FULL job (OR_ENABLE_VACUUM_FULL=true)..."
+
 # Create scripts directory if it doesn't exist
 mkdir -p /var/lib/postgresql/scripts
 
@@ -13,7 +21,7 @@ cat > /var/lib/postgresql/scripts/vacuum_full.sh << 'EOF'
 # Log file for vacuum operations
 LOG_FILE="/var/lib/postgresql/vacuum_full.log"
 
-echo "$(date): Starting weekly VACUUM FULL operation" >> "$LOG_FILE"
+echo "$(date): Starting VACUUM FULL operation" >> "$LOG_FILE"
 
 # Get list of all tables in the database
 TABLES=$(psql -t -c "SELECT schemaname || '.' || tablename FROM pg_tables WHERE schemaname NOT IN ('pg_catalog', 'information_schema')" "${POSTGRES_DB:-postgres}")
@@ -25,14 +33,17 @@ for TABLE in $TABLES; do
     echo "$(date): Completed VACUUM FULL on $TABLE" >> "$LOG_FILE"
 done
 
-echo "$(date): Weekly VACUUM FULL operation completed" >> "$LOG_FILE"
+echo "$(date): VACUUM FULL operation completed" >> "$LOG_FILE"
 EOF
 
 # Make the script executable
 chmod +x /var/lib/postgresql/scripts/vacuum_full.sh
 
-# Set up cron job to run the script weekly (Sunday at 12:00 AM)
-CRON_ENTRY="0 0 * * 0 /var/lib/postgresql/scripts/vacuum_full.sh"
+# Parse the cron schedule from environment variable or use default (Sunday at 12:00 AM)
+CRON_SCHEDULE="${OR_VACUUM_FULL_CRON_SCHEDULE:-0 0 * * 0}"
+CRON_ENTRY="$CRON_SCHEDULE /var/lib/postgresql/scripts/vacuum_full.sh"
+
+echo "Using cron schedule: $CRON_SCHEDULE"
 
 # Detect which cron system is available
 if command -v crond > /dev/null 2>&1; then
@@ -41,12 +52,12 @@ if command -v crond > /dev/null 2>&1; then
     mkdir -p /etc/crontabs
     echo "$CRON_ENTRY" > /etc/crontabs/postgres
     chmod 600 /etc/crontabs/postgres
-    echo "Weekly VACUUM FULL job has been scheduled (Sundays at 12:00 AM) using dcron"
+    echo "VACUUM FULL job has been scheduled using dcron"
 
     # Create a script to start crond when container starts
     cat > /var/lib/postgresql/scripts/start_cron.sh << 'EOF'
 #!/bin/sh
-if [ -x "$(command -v crond)" ]; then
+if [ -x "$(command -v crond)" ] && [ "${OR_ENABLE_VACUUM_FULL:-false}" = "true" ]; then
   echo "Starting crond service for scheduled database maintenance..."
   crond -b -L /var/lib/postgresql/cron.log
 fi
@@ -57,7 +68,7 @@ elif command -v cron > /dev/null 2>&1; then
     # Debian/Ubuntu (standard cron)
     echo "Setting up cron job using standard cron..."
     (crontab -u postgres -l 2>/dev/null || echo "") | echo "$CRON_ENTRY" | crontab -u postgres -
-    echo "Weekly VACUUM FULL job has been scheduled (Sundays at 12:00 AM) using standard cron"
+    echo "VACUUM FULL job has been scheduled using standard cron"
 else
     echo "WARNING: No cron system found. VACUUM FULL will not be automatically scheduled."
 fi

or-entrypoint.sh

@@ -377,13 +377,17 @@ if [ -n "$DATABASE_ALREADY_EXISTS" ]; then
     fi
 fi
 
-# Start cron service if it exists (for scheduled VACUUM FULL operations)
-if [ -x "$(command -v cron)" ]; then
-  echo "Starting cron service for scheduled database maintenance..."
-  service cron start
-elif [ -x "$(command -v crond)" ] && [ -f "/var/lib/postgresql/scripts/start_cron.sh" ]; then
-  echo "Starting Alpine crond service for scheduled database maintenance..."
-  /var/lib/postgresql/scripts/start_cron.sh
+# Start cron service if it exists and VACUUM FULL is enabled
+if [ "${OR_ENABLE_VACUUM_FULL:-false}" = "true" ]; then
+  if [ -x "$(command -v cron)" ]; then
+    echo "Starting cron service for scheduled database maintenance (OR_ENABLE_VACUUM_FULL=true)..."
+    service cron start
+  elif [ -x "$(command -v crond)" ] && [ -f "/var/lib/postgresql/scripts/start_cron.sh" ]; then
+    echo "Starting Alpine crond service for scheduled database maintenance (OR_ENABLE_VACUUM_FULL=true)..."
+    /var/lib/postgresql/scripts/start_cron.sh
+  fi
+else
+  echo "VACUUM FULL is disabled (OR_ENABLE_VACUUM_FULL is not set to 'true'). Skipping cron service."
 fi
 
 exec /docker-entrypoint.sh $@