add --force to PUSH_ARGS and docker/build-push-action@v6

SamR1 · Oct 24, 2024 · ea34503 · ea34503
1 parent 197bfdd
commit ea34503
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -25,6 +25,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+      - name: Set BUILD_TIME env
+        run: echo BUILD_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ") >> ${GITHUB_ENV}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -49,7 +51,7 @@ jobs:
             type=semver,pattern=release
             type=sha
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: linux/amd64,linux/arm64

diff --git a/.github/workflows/sync-merge.yaml b/.github/workflows/sync-merge.yaml
@@ -16,7 +16,7 @@ env:
   # Optional merge arguments
   MERGE_ARGS: ""
   # Optional push arguments
-  PUSH_ARGS: "--tags"
+  PUSH_ARGS: "--tags --force"
   # Optional toggle to spawn time logs (keeps action active) 
   SPAWN_LOGS: "false" # "true" or "false"