supabase · pcnc · Jun 13, 2023 · Jun 9, 2023 · Jun 9, 2023 · Jun 9, 2023
@@ -3,10 +3,10 @@ name: Release AIO image on Dockerhub
 on:
   push:
     branches:
-      - pcnc/migrate-all-in-one
+      - pcnc/fly-fixes
     paths:
       - ".github/workflows/dockerhub-release-aio.yml"
-      - "docker/all-in-one/Dockerfile"
+      - "docker/all-in-one/*"
       - "common.vars*"
   workflow_run:
     workflows: [Release on Dockerhub]

@@ -11,6 +11,7 @@
 
 # - Recovery Target -
 
+#recovery_target = 'immediate'
 #recovery_target_time = ''
 #recovery_target_action = 'promote'
 #recovery_target_timeline = 'current'

@@ -42,7 +42,7 @@ postgres_exporter_release_checksum:
   amd64: sha256:ff541bd3ee19c0ae003d71424a75edfcc8695e828dd20d5b4555ce433c89d60b
 
 adminapi_release: 0.44.3
-adminmgr_release: 0.4.0
+adminmgr_release: 0.5.0
 
 # Postgres Extensions
 postgis_release: "3.3.2"

@@ -5,7 +5,7 @@ ARG postgrest_release=10.1.2
 ARG gotrue_release=2.47.0
 ARG kong_release=2.8.1
 ARG adminapi_release=0.44.3
-ARG adminmgr_release=0.4.0
+ARG adminmgr_release=0.5.0
 ARG vector_release=0.22.3
 ARG postgres_exporter_release=0.9.0
 
@@ -230,4 +230,6 @@ HEALTHCHECK --interval=3s --timeout=2s --start-period=4s --retries=10 CMD [ "hea
 
 COPY docker/all-in-one/init /init
 COPY docker/all-in-one/entrypoint.sh /usr/local/bin/
+COPY docker/all-in-one/postgres-entrypoint.sh /usr/local/bin/
+COPY docker/all-in-one/shutdown.sh /usr/local/bin/supa-shutdown
 ENTRYPOINT [ "entrypoint.sh" ]
@@ -40,6 +40,8 @@ function configure_services {
 PG_CONF=/etc/postgresql/postgresql.conf
 SUPERVISOR_CONF=/etc/supervisor/supervisord.conf
 
+export CONFIGURED_FLAG_PATH=${CONFIGURED_FLAG_PATH:-$DATA_VOLUME_MOUNTPOINT/machine.configured}
+
 function setup_postgres {
   tar -xzvf "$INIT_PAYLOAD_PATH" -C / ./etc/postgresql.schema.sql
   mv /etc/postgresql.schema.sql /docker-entrypoint-initdb.d/migrations/99-schema.sql
@@ -75,6 +77,40 @@ function setup_postgres {
     -e "s|ssl_key_file = ''|ssl_key_file = '$PGSSLKEY'|g" \
     $PG_CONF
 
+  if [ "${DATA_VOLUME_MOUNTPOINT}" ]; then
+    # Preserve postgresql configs across restarts
+    POSTGRESQL_CUSTOM_DIR="${DATA_VOLUME_MOUNTPOINT}/etc/postgresql-custom"
+
+    mkdir -p "${POSTGRESQL_CUSTOM_DIR}"
+
+    if [ ! -f "${CONFIGURED_FLAG_PATH}" ]; then
+      echo "Copying existing custom postgresql config from /etc/postgresql-custom to ${POSTGRESQL_CUSTOM_DIR}"
+      cp -R "/etc/postgresql-custom/." "${POSTGRESQL_CUSTOM_DIR}/"
+    fi
+
+    rm -rf "/etc/postgresql-custom"
+    ln -s "${POSTGRESQL_CUSTOM_DIR}" "/etc/postgresql-custom"
+    chown -R postgres:postgres "/etc/postgresql-custom"
+    chown -R postgres:postgres "${POSTGRESQL_CUSTOM_DIR}"
+    chmod g+rx "${POSTGRESQL_CUSTOM_DIR}"
+
+    # Preserve wal-g configs across restarts
+    WALG_CONF_DIR="${DATA_VOLUME_MOUNTPOINT}/etc/wal-g"
+    mkdir -p "${WALG_CONF_DIR}"
+
+    if [ ! -f "${CONFIGURED_FLAG_PATH}" ]; then
+      echo "Copying existing custom wal-g config from /etc/wal-g to ${WALG_CONF_DIR}"
+      cp -R "/etc/wal-g/." "${WALG_CONF_DIR}/"
+    fi
+
+    rm -rf "/etc/wal-g"
+    ln -s "${WALG_CONF_DIR}" "/etc/wal-g"
+    chown -R adminapi:adminapi "/etc/wal-g"
+    chown -R adminapi:adminapi "${WALG_CONF_DIR}"
+    chmod g+rx "/etc/wal-g"
+    chmod g+rx "${WALG_CONF_DIR}"
+  fi
+
   # TODO: define instance size and type for running optimizations
   # /opt/supabase-admin-api optimize db --destination-config-file-path /etc/postgresql-custom/generated-optimizations.conf
   # /opt/supabase-admin-api optimize pgbouncer --destination-config-file-path /etc/pgbouncer-custom/generated-optimizations.ini
@@ -121,14 +157,15 @@ fi
 if [ "${PGDATA_REAL:-}" ]; then
     mkdir -p "${PGDATA_REAL}"
     chown -R postgres:postgres "${PGDATA_REAL}"
-    chmod g+rx "${PGDATA_REAL}"
+    chmod -R g+rx "${PGDATA_REAL}"
 fi
 
 if [ "${PGDATA:-}" ]; then
   if [ "${PGDATA_REAL:-}" ]; then
     mkdir -p "$(dirname "${PGDATA}")"
     rm -rf "${PGDATA}"
     ln -s "${PGDATA_REAL}" "${PGDATA}"
+    chmod -R g+rx "${PGDATA}"
   else
     mkdir -p "$PGDATA"
     chown postgres:postgres "$PGDATA"
@@ -138,10 +175,28 @@ fi
 
 # Download and extract init payload from s3
 export INIT_PAYLOAD_PATH=${INIT_PAYLOAD_PATH:-/tmp/payload.tar.gz}
-export CONFIGURED_FLAG_PATH=${CONFIGURED_FLAG_PATH:-$PGDATA/../machine.configured}
 
 if [ "${INIT_PAYLOAD_PRESIGNED_URL:-}" ]; then
-  curl -sSL "$INIT_PAYLOAD_PRESIGNED_URL" -o "$INIT_PAYLOAD_PATH"
+  curl -sSL "$INIT_PAYLOAD_PRESIGNED_URL" -o "/tmp/payload.tar.gz"
+  mv "/tmp/payload.tar.gz" "$INIT_PAYLOAD_PATH"
+fi
+
+if [ "${DATA_VOLUME_MOUNTPOINT}" ]; then
+  LOGS_FOLDER="${DATA_VOLUME_MOUNTPOINT}/logs"
+
+  mkdir -p "${LOGS_FOLDER}/postgresql"
+  mkdir -p "${LOGS_FOLDER}/services"
+  mkdir -p "${LOGS_FOLDER}/wal-g"
+
+  rm -rf "/var/log/postgresql"
+  rm -rf "/var/log/services"
+  rm -rf "/var/log/wal-g"
+
+  ln -s "${LOGS_FOLDER}/postgresql" "/var/log/postgresql"
+  ln -s "${LOGS_FOLDER}/services" "/var/log/services"
+  ln -s "${LOGS_FOLDER}/wal-g" "/var/log/wal-g"
+
+  chown -R postgres:postgres "${LOGS_FOLDER}"
 fi
 
 # Process init payload
@@ -152,7 +207,7 @@ else
   echo "Skipped extracting init payload: $INIT_PAYLOAD_PATH does not exist"
 fi
 
-mkdir /var/log/services
+mkdir -p /var/log/services
 
 SUPERVISOR_CONF=/etc/supervisor/supervisord.conf
 find /etc/supervisor/ -type d -exec chmod 0770 {} +

diff --git a/docker/all-in-one/etc/postgresql/logging.conf b/docker/all-in-one/etc/postgresql/logging.conf
@@ -31,3 +31,5 @@ log_rotation_size = 0		# Automatic rotation of logfiles will
 					# or size-driven rotation.  Default is
 					# off, meaning append to existing files
 					# in all cases.
+
+log_disconnections = on			# log end of a session, including duration
@@ -1,5 +1,5 @@
 [program:postgresql]
-command=/usr/local/bin/docker-entrypoint.sh postgres -D /etc/postgresql
+command=/usr/local/bin/postgres-entrypoint.sh postgres -D /etc/postgresql
 user=postgres
 stopsignal=INT
 autorestart=true

@@ -0,0 +1,9 @@
+[program:supa-shutdown]
+command=/usr/local/bin/supa-shutdown
+user=root
+autorestart=true
+autostart=true
+stdout_logfile=/var/log/services/supa-shutdown.log
+redirect_stderr=true
+stdout_logfile_maxbytes=10MB
+priority=50