Merge branch 'master' of https://github.com/SquirrelCorporation/Squir…

…relServersManager

.github/workflows/docker-publish.yml

@@ -20,11 +20,6 @@ env:
 jobs:
   build-and-publish-server:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        platform:
-          - linux/arm64/v8
-          - linux/amd64
     permissions:
       contents: read
       packages: write
@@ -83,12 +78,13 @@ jobs:
           build-args: |
             NODE_ENV: production
           target: production
-          platforms: ${{ matrix.platform }}
+          provenance: false
+          platforms: linux/amd64,linux/arm64,linux/arm64/v8
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=buildkit
+          cache-to: type=gha,mode=max,scope=buildkit
 
       # Sign the resulting Docker image digest except on PRs.
       # This will only write to the public Rekor transparency log when the Docker
@@ -107,11 +103,6 @@ jobs:
 
   build-and-publish-client:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        platform:
-          - linux/arm64/v8
-          - linux/amd64
     permissions:
       contents: read
       packages: write
@@ -168,12 +159,13 @@ jobs:
           build-contexts: |
             shared-lib=./shared-lib
           target: production
-          platforms: ${{ matrix.platform }}
+          provenance: false
+          platforms: linux/amd64,linux/arm64,linux/arm64/v8
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=buildkit
+          cache-to: type=gha,mode=max,scope=buildkit
 
       # Sign the resulting Docker image digest except on PRs.
       # This will only write to the public Rekor transparency log when the Docker