From b079b592a740b8eac79e4e8dc97aa33906cf740f Mon Sep 17 00:00:00 2001
From: Sam Rose <samuel@supabase.io>
Date: Wed, 7 Aug 2024 17:53:31 +0000
Subject: [PATCH 1/3] test: use postgres release version for docker tag

---
 .github/workflows/test.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f2de89a82..810d1a076 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,6 +23,10 @@ jobs:
       POSTGRES_PASSWORD: password
     steps:
       - uses: actions/checkout@v3
+      - id: settings
+        # Remove spaces and quotes to get the raw version string
+        run: sed -r 's/(\s|\")+//g' common-nix.vars.pkr.hcl >> $GITHUB_OUTPUT
+
       - id: args
         uses: mikefarah/yq@master
         with:
@@ -39,11 +43,11 @@ jobs:
           target: production
           build-args: |
             ${{ steps.args.outputs.result }}
-          tags: supabase/postgres:latest
+          tags: supabase/postgres:${{ steps.settings.outputs.postgres_version }}
           cache-from: |
-            type=gha,scope=${{ github.ref_name }}-latest-${{ matrix.arch }}
-            type=gha,scope=${{ github.base_ref }}-latest-${{ matrix.arch }}
-          cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-latest-${{ matrix.arch }}
+            type=gha,scope=${{ github.ref_name }}-${{ steps.settings.outputs.postgres_version }}-${{ matrix.arch }}
+            type=gha,scope=${{ github.base_ref }}-${{ steps.settings.outputs.postgres_version }}-${{ matrix.arch }}
+          cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-${{ steps.settings.outputs.postgres_version }}-${{ matrix.arch }}
 
       - name: Start Postgres
         run: |
@@ -51,8 +55,7 @@ jobs:
           -e POSTGRES_PASSWORD=${{ env.POSTGRES_PASSWORD }} \
           -p ${{ env.POSTGRES_PORT }}:5432 \
           --name supabase_postgres \
-          -d supabase/postgres:latest
-
+          -d supabase/postgres:${{ steps.settings.outputs.postgres_version }}
       - name: Install psql
         run: |
           sudo apt update

From ea23d3a9dbfe3424578d523748e66e5bb5e43259 Mon Sep 17 00:00:00 2001
From: Sam Rose <samuel@supabase.io>
Date: Wed, 7 Aug 2024 18:02:05 +0000
Subject: [PATCH 2/3] fix: ref the var correct

---
 .github/workflows/test.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 810d1a076..9c56c7756 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -43,11 +43,11 @@ jobs:
           target: production
           build-args: |
             ${{ steps.args.outputs.result }}
-          tags: supabase/postgres:${{ steps.settings.outputs.postgres_version }}
+          tags: supabase/postgres:${{ steps.settings.outputs.postgres-version }}
           cache-from: |
-            type=gha,scope=${{ github.ref_name }}-${{ steps.settings.outputs.postgres_version }}-${{ matrix.arch }}
-            type=gha,scope=${{ github.base_ref }}-${{ steps.settings.outputs.postgres_version }}-${{ matrix.arch }}
-          cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-${{ steps.settings.outputs.postgres_version }}-${{ matrix.arch }}
+            type=gha,scope=${{ github.ref_name }}-${{ steps.settings.outputs.postgres-version }}-${{ matrix.arch }}
+            type=gha,scope=${{ github.base_ref }}-${{ steps.settings.outputs.postgres-version }}-${{ matrix.arch }}
+          cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-${{ steps.settings.outputs.postgres-version }}-${{ matrix.arch }}
 
       - name: Start Postgres
         run: |
@@ -55,7 +55,7 @@ jobs:
           -e POSTGRES_PASSWORD=${{ env.POSTGRES_PASSWORD }} \
           -p ${{ env.POSTGRES_PORT }}:5432 \
           --name supabase_postgres \
-          -d supabase/postgres:${{ steps.settings.outputs.postgres_version }}
+          -d supabase/postgres:${{ steps.settings.outputs.postgres-version }}
       - name: Install psql
         run: |
           sudo apt update

From 01cea266eba71af0956e81e779462a3b7b58a85e Mon Sep 17 00:00:00 2001
From: Sam Rose <samuel@supabase.io>
Date: Wed, 7 Aug 2024 18:16:14 +0000
Subject: [PATCH 3/3] fix: use correct Dockerfile

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9c56c7756..be9c9a72d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -40,6 +40,7 @@ jobs:
         with:
           load: true
           context: .
+          file: "Dockerfile-156"
           target: production
           build-args: |
             ${{ steps.args.outputs.result }}