fix: add per image scope to gha cache (#745)

sweatybridge · web-flow · commit c49ae59fc3d9 · 2023-10-04T12:53:51.000+08:00
* chore: scope gha cache by image tag

* chore: bump action runner version

* chore: add runner arch to scope

* chore: stop exporting extensions cache
diff --git a/.github/workflows/ami-release.yml b/.github/workflows/ami-release.yml
@@ -35,20 +35,19 @@ jobs:
         with:
           cmd: yq 'to_entries | map(select(.value|type == "!!str")) |  map(.key + "=" + .value) | join("\n")' 'ansible/vars.yml'
       - run: docker context create builders
-      - uses: docker/setup-buildx-action@v2
+      - uses: docker/setup-buildx-action@v3
         with:
           endpoint: builders
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
-          push: false
           load: true
           build-args: |
             ${{ steps.args.outputs.result }}
           target: extensions
           tags: supabase/postgres:extensions
           platforms: linux/${{ matrix.arch }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=${{ github.ref_name }}-latest-${{ matrix.arch }}
+          # No need to export extensions cache because latest depends on it
       - name: Extract built packages
         run: |
           mkdir -p /tmp/extensions ansible/files/extensions
@@ -60,9 +59,8 @@ jobs:
       - id: version
         run: echo "${{ steps.args.outputs.result }}" | grep "postgresql" >> "$GITHUB_OUTPUT"
       - name: Build Postgres deb
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
-          push: false
           load: true
           file: docker/Dockerfile
           target: pg-deb
@@ -74,8 +72,8 @@ jobs:
             CPPFLAGS=-mcpu=${{ matrix.mcpu }}
           tags: supabase/postgres:deb
           platforms: linux/${{ matrix.arch }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=${{ github.ref_name }}-deb
+          cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-deb
       - name: Extract Postgres deb
         run: |
           mkdir -p /tmp/build ansible/files/postgres
diff --git a/.github/workflows/build-ccache.yml b/.github/workflows/build-ccache.yml
@@ -44,7 +44,7 @@ jobs:
       image_digest: ${{ steps.build.outputs.digest }}
     steps:
       - run: docker context create builders
-      - uses: docker/setup-buildx-action@v2
+      - uses: docker/setup-buildx-action@v3
         with:
           endpoint: builders
       - name: Configure AWS credentials - prod
@@ -56,7 +56,7 @@ jobs:
         with:
           registry: public.ecr.aws
       - id: build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           push: true
           target: buildcache
@@ -70,7 +70,7 @@ jobs:
     needs: build_image
     runs-on: ubuntu-latest
     steps:
-      - uses: docker/setup-buildx-action@v2
+      - uses: docker/setup-buildx-action@v3
       - name: Configure AWS credentials - prod
         uses: aws-actions/configure-aws-credentials@v1
         with:
diff --git a/.github/workflows/collect-u18-binaries.yml b/.github/workflows/collect-u18-binaries.yml
@@ -44,21 +44,20 @@ jobs:
         with:
           cmd: yq 'to_entries | map(select(.value|type == "!!str")) |  map(.key + "=" + .value) | join("\n")' 'ansible/vars.yml'
       - run: docker context create builders
-      - uses: docker/setup-buildx-action@v2
+      - uses: docker/setup-buildx-action@v3
         with:
-          endpoint: builders          
-      - uses: docker/build-push-action@v3
+          endpoint: builders
+      - uses: docker/build-push-action@v5
         with:
-          push: false
           load: true
           file: Dockerfile-u18
           build-args: |
             ${{ steps.args.outputs.result }}
           target: extensions
           tags: supabase/postgres:extensions-u18
           platforms: linux/${{ matrix.arch }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max,ignore-error=true
+          cache-from: type=gha,scope=${{ github.ref_name }}-extensions-u18
+          cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-extensions-u18,ignore-error=true
 
       - name: Extract built packages
         run: |
@@ -71,9 +70,8 @@ jobs:
       - id: version
         run: echo "${{ steps.args.outputs.result }}" | grep "postgresql" >> "$GITHUB_OUTPUT"
       - name: Build Postgres deb
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
-          push: false
           load: true
           file: docker/Dockerfile
           target: pg-deb
@@ -85,20 +83,19 @@ jobs:
             DEB_BUILD_PROFILES=pkg.postgresql.nozstd
           tags: supabase/postgres:deb-u18
           platforms: linux/${{ matrix.arch }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max,ignore-error=true
+          cache-from: type=gha,scope=${{ github.ref_name }}-deb-u18
+          cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-deb-u18,ignore-error=true
       - name: Extract Postgres deb
         run: |
           mkdir -p /tmp/build ansible/files/postgres
           docker save supabase/postgres:deb-u18 | tar xv -C /tmp/build
           for layer in /tmp/build/*/layer.tar; do
             tar xvf "$layer" -C ansible/files/postgres --strip-components 1
           done
-        
+
       - name: Build surrogate Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
-          push: false
           load: true
           file: Dockerfile-u18
           target: pg_binary_collection
@@ -109,8 +106,8 @@ jobs:
             postgresql_release=${{ steps.version.outputs.postgresql_release }}
           tags: supabase/postgres:u18-binaries
           platforms: linux/${{ matrix.arch }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max,ignore-error=true
+          cache-from: type=gha,scope=${{ github.ref_name }}-u18-binaries
+          cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-u18-binaries,ignore-error=true
 
       - name: Copy binary tarball
         run: |
diff --git a/.github/workflows/dockerhub-release-aio.yml b/.github/workflows/dockerhub-release-aio.yml
@@ -47,15 +47,15 @@ jobs:
       image_digest: ${{ steps.build.outputs.digest }}
     steps:
       - run: docker context create builders
-      - uses: docker/setup-buildx-action@v2
+      - uses: docker/setup-buildx-action@v3
         with:
           endpoint: builders
       - uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - id: build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           file: docker/all-in-one/Dockerfile
           push: true
@@ -65,8 +65,8 @@ jobs:
           target: production
           tags: ${{ needs.settings.outputs.image_tag }}_${{ matrix.arch }}
           platforms: linux/${{ matrix.arch }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=${{ github.ref_name }}-aio-${{ matrix.arch }}
+          cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-aio-${{ matrix.arch }}
       - name: Slack Notification
         if: ${{ failure() }}
         uses: rtCamp/action-slack-notify@v2
@@ -81,7 +81,7 @@ jobs:
     needs: [settings, build_image]
     runs-on: ubuntu-latest
     steps:
-      - uses: docker/setup-buildx-action@v2
+      - uses: docker/setup-buildx-action@v3
       - uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
diff --git a/.github/workflows/dockerhub-release.yml b/.github/workflows/dockerhub-release.yml
@@ -40,24 +40,24 @@ jobs:
       image_digest: ${{ steps.build.outputs.digest }}
     steps:
       - run: docker context create builders
-      - uses: docker/setup-buildx-action@v2
+      - uses: docker/setup-buildx-action@v3
         with:
           endpoint: builders
       - uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - id: build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           push: true
           build-args: |
             ${{ needs.settings.outputs.build_args }}
           target: production
           tags: ${{ needs.settings.outputs.image_tag }}_${{ matrix.arch }}
           platforms: linux/${{ matrix.arch }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=${{ github.ref_name }}-latest-${{ matrix.arch }}
+          cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-latest-${{ matrix.arch }}
       - name: Slack Notification
         if: ${{ failure() }}
         uses: rtCamp/action-slack-notify@v2
@@ -72,7 +72,7 @@ jobs:
     needs: [settings, build_image]
     runs-on: ubuntu-latest
     steps:
-      - uses: docker/setup-buildx-action@v2
+      - uses: docker/setup-buildx-action@v3
       - uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
diff --git a/.github/workflows/package-plv8.yml b/.github/workflows/package-plv8.yml
@@ -43,7 +43,7 @@ jobs:
       image_digest: ${{ steps.build.outputs.digest }}
     steps:
       - run: docker context create builders
-      - uses: docker/setup-buildx-action@v2
+      - uses: docker/setup-buildx-action@v3
         with:
           endpoint: builders
       - uses: docker/login-action@v2
@@ -52,7 +52,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - id: build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           push: true
           target: plv8-deb
@@ -64,7 +64,7 @@ jobs:
     needs: [settings, build_image]
     runs-on: ubuntu-latest
     steps:
-      - uses: docker/setup-buildx-action@v2
+      - uses: docker/setup-buildx-action@v3
       - uses: docker/login-action@v2
         with:
           registry: ghcr.io
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -29,20 +29,21 @@ jobs:
           cmd: yq 'to_entries | map(select(.value|type == "!!str")) |  map(.key + "=" + .value) | join("\n")' 'ansible/vars.yml'
 
       - run: docker context create builders
-      - uses: docker/setup-buildx-action@v2
+      - uses: docker/setup-buildx-action@v3
         with:
           endpoint: builders
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
-          push: false
           load: true
           context: .
           target: production
           build-args: |
             ${{ steps.args.outputs.result }}
           tags: supabase/postgres:latest
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          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 }}
 
       - name: Start Postgres
         run: |
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.5-labs
+# syntax=docker/dockerfile:1.6
 ARG postgresql_major=15
 ARG postgresql_release=${postgresql_major}.1
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# syntax=docker/dockerfile:1.5-labs`
	`1`	`+# syntax=docker/dockerfile:1.6`
`2`	`2`	`ARG postgresql_major=15`
`3`	`3`	`ARG postgresql_release=${postgresql_major}.1`
`4`	`4`