From 348f84ec8b95dcb2619eff8eb07a4dfa2bd8b7a3 Mon Sep 17 00:00:00 2001
From: Paul Cioanca <paul.cioanca@supabase.io>
Date: Mon, 2 Sep 2024 12:03:13 +0300
Subject: [PATCH 1/4] fix: fly delegated entrypoint handler fallback

---
 docker/all-in-one/entrypoint.sh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/docker/all-in-one/entrypoint.sh b/docker/all-in-one/entrypoint.sh
index 97e68a6aa..3a70dc9aa 100755
--- a/docker/all-in-one/entrypoint.sh
+++ b/docker/all-in-one/entrypoint.sh
@@ -218,7 +218,7 @@ function fetch_and_execute_delegated_payload {
 
   if [ ! -f $DELEGATED_ARCHIVE_PATH ]; then
     echo "No delegated payload found, bailing"
-    return
+    return 1
   fi
 
   # only extract a valid archive
@@ -238,14 +238,17 @@ function fetch_and_execute_delegated_payload {
     fi
   else
     echo "Invalid TAR archive"
-    return
   fi
 
   # Run our delegated entry script here
   if [ -f "$DELEGATED_ENTRY_PATH" ]; then
     chmod +x $DELEGATED_ENTRY_PATH
     bash -c "$DELEGATED_ENTRY_PATH $START_TIME"
+  else
+    return 1
   fi
+
+  exit 0 
 }
 
 # Increase max number of open connections
@@ -356,11 +359,9 @@ fi
 touch "$CONFIGURED_FLAG_PATH"
 run_prelaunch_hooks
 
-if [ -n "${DELEGATED_INIT_LOCATION:-}" ]; then
-  fetch_and_execute_delegated_payload
-else
-  DURATION=$(calculate_duration "$START_TIME" "$(date +%s%N)")
-  echo "E: Execution time to starting supervisor: $DURATION milliseconds"
-  start_supervisor
-  push_lsn_checkpoint_file
-fi
+fetch_and_execute_delegated_payload
+
+DURATION=$(calculate_duration "$START_TIME" "$(date +%s%N)")
+echo "E: Execution time to starting supervisor: $DURATION milliseconds"
+start_supervisor
+push_lsn_checkpoint_file

From be7d35d348ea4056f1710bb4ca0cf20668b44140 Mon Sep 17 00:00:00 2001
From: Paul Cioanca <paul.cioanca@supabase.io>
Date: Mon, 2 Sep 2024 12:04:00 +0300
Subject: [PATCH 2/4] chore: bump image version

---
 .github/workflows/dockerhub-release.yml | 1 +
 common.vars.pkr.hcl                     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/dockerhub-release.yml b/.github/workflows/dockerhub-release.yml
index 7f4be5552..7d90d6f7b 100644
--- a/.github/workflows/dockerhub-release.yml
+++ b/.github/workflows/dockerhub-release.yml
@@ -7,6 +7,7 @@ on:
     paths:
       - ".github/workflows/dockerhub-release.yml"
       - "common.vars*"
+  workflow_dispatch:
  
 jobs:
   settings:
diff --git a/common.vars.pkr.hcl b/common.vars.pkr.hcl
index 82123f85e..ce0d34bdb 100644
--- a/common.vars.pkr.hcl
+++ b/common.vars.pkr.hcl
@@ -1 +1 @@
-postgres-version = "15.1.1.90"
+postgres-version = "15.1.1.91"

From 71f0ab065c371f586f33e66cebb3e874889fa4f0 Mon Sep 17 00:00:00 2001
From: Paul Cioanca <paul.cioanca@supabase.io>
Date: Mon, 2 Sep 2024 15:03:08 +0300
Subject: [PATCH 3/4] chore: remove pg_backtrace

---
 common.vars.pkr.hcl             | 2 +-
 docker/all-in-one/entrypoint.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common.vars.pkr.hcl b/common.vars.pkr.hcl
index ce0d34bdb..c6b281a0d 100644
--- a/common.vars.pkr.hcl
+++ b/common.vars.pkr.hcl
@@ -1 +1 @@
-postgres-version = "15.1.1.91"
+postgres-version = "15.1.1.92"
diff --git a/docker/all-in-one/entrypoint.sh b/docker/all-in-one/entrypoint.sh
index 3a70dc9aa..9ae5a9f8e 100755
--- a/docker/all-in-one/entrypoint.sh
+++ b/docker/all-in-one/entrypoint.sh
@@ -58,10 +58,10 @@ function configure_services {
 }
 
 function enable_swap {
-  fallocate -l 1G /mnt/swapfile
-  chmod 600 /mnt/swapfile
-  mkswap /mnt/swapfile
-  swapon /mnt/swapfile
+  fallocate -l 1G /data/swapfile
+  chmod 600 /data/swapfile
+  mkswap /data/swapfile
+  swapon /data/swapfile
 }
 
 function push_lsn_checkpoint_file {

From cfa6da752cebf5ce7e91ff17d7a21b5bf7d26d1a Mon Sep 17 00:00:00 2001
From: Paul Cioanca <paul.cioanca@supabase.io>
Date: Mon, 2 Sep 2024 15:22:08 +0300
Subject: [PATCH 4/4] chore: resize swap and move to data dir

---
 common.vars.pkr.hcl             | 2 +-
 docker/all-in-one/entrypoint.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common.vars.pkr.hcl b/common.vars.pkr.hcl
index c6b281a0d..3c999dccd 100644
--- a/common.vars.pkr.hcl
+++ b/common.vars.pkr.hcl
@@ -1 +1 @@
-postgres-version = "15.1.1.92"
+postgres-version = "15.1.1.93"
diff --git a/docker/all-in-one/entrypoint.sh b/docker/all-in-one/entrypoint.sh
index 9ae5a9f8e..50194b93e 100755
--- a/docker/all-in-one/entrypoint.sh
+++ b/docker/all-in-one/entrypoint.sh
@@ -58,7 +58,7 @@ function configure_services {
 }
 
 function enable_swap {
-  fallocate -l 1G /data/swapfile
+  fallocate -l 512M /data/swapfile
   chmod 600 /data/swapfile
   mkswap /data/swapfile
   swapon /data/swapfile