fix: resolve merge conflict in go.mod

Take newer upstream dependency versions and keep golang.org/x/mod addition.

Author: chaptersix

.github/actions/build-docker-images/action.yml

@@ -161,7 +161,17 @@ runs:
           unset ALPINE_TAG
         fi
 
-        docker buildx bake \
-          --push \
-          -f docker/docker-bake.hcl \
-          server admin-tools
+        for attempt in 1 2 3; do
+          echo "Docker build/push attempt $attempt/3"
+          if timeout 1200 docker buildx bake \
+              --push \
+              -f docker/docker-bake.hcl \
+              server admin-tools; then
+            exit 0
+          fi
+          if [ "$attempt" -lt 3 ]; then
+            echo "Attempt $attempt failed, retrying in 30s..."
+            sleep 30
+          fi
+        done
+        exit 1

.github/workflows/build-and-publish.yml

@@ -14,6 +14,7 @@ permissions:
 jobs:
   build-and-push-docker:
     runs-on: ubuntu-latest
+    timeout-minutes: 90
     # Only push for main, cloud, release branches (not feature)
     if: |
       github.ref == 'refs/heads/main' ||