From fa84f52f0b08deb600bd23db0cbc4ba499fc757d Mon Sep 17 00:00:00 2001
From: Neha Sherpa <nsherpa@squareup.com>
Date: Thu, 29 Jan 2026 15:38:48 -0800
Subject: [PATCH 1/2] fix: Push images to docker hub as well

---
 .github/workflows/publish-docker.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 5a96735..d7ceda9 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -7,7 +7,6 @@ on:
       - completed
     branches:
       - main
-      - docker
   push:
     tags:
       - "v*.*.*"
@@ -42,6 +41,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Log in to Docker Hub
+        env:
+          DOCKER_HUB_PULL_TOKEN: ${{ secrets.DOCKER_HUB_PULL_TOKEN }}
+        run: |
+          echo "${DOCKER_HUB_PULL_TOKEN}" | docker login --username "blockossreleases" --password-stdin
+
       - name: Extract version metadata
         id: meta
         run: |
@@ -61,7 +66,9 @@ jobs:
         id: docker_meta
         uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # pin@v5.8.0
         with:
-          images: ghcr.io/${{ github.repository_owner }}/cachew
+          images: |
+            ghcr.io/${{ github.repository_owner }}/cachew
+            blockossreleases/cachew
           tags: |
             # For main branch: latest, main, and sha
             type=ref,event=branch

From 482f0b57877e6ff175e76f73a08d979ceb004b62 Mon Sep 17 00:00:00 2001
From: Neha Sherpa <nsherpa@squareup.com>
Date: Fri, 30 Jan 2026 16:19:08 -0800
Subject: [PATCH 2/2] fix: Use the correct dockerhub creds for pulling images

See https://sq-block.slack.com/archives/C02FD8Z50/p1769736136104229
---
 .github/workflows/publish-docker.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index d7ceda9..7c86da6 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -43,9 +43,9 @@ jobs:
 
       - name: Log in to Docker Hub
         env:
-          DOCKER_HUB_PULL_TOKEN: ${{ secrets.DOCKER_HUB_PULL_TOKEN }}
+          DOCKER_HUB_PUSH_TOKEN: ${{ secrets.DOCKER_HUB_PUSH_TOKEN }}
         run: |
-          echo "${DOCKER_HUB_PULL_TOKEN}" | docker login --username "blockossreleases" --password-stdin
+          echo "${DOCKER_HUB_PUSH_TOKEN}" | docker login --username "squareup" --password-stdin
 
       - name: Extract version metadata
         id: meta
@@ -68,7 +68,7 @@ jobs:
         with:
           images: |
             ghcr.io/${{ github.repository_owner }}/cachew
-            blockossreleases/cachew
+            squareup/cachew
           tags: |
             # For main branch: latest, main, and sha
             type=ref,event=branch