From bf7ca937ff66d6b5f7b33dc90f071b022a09b888 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Mon, 25 May 2026 22:00:28 -0700
Subject: [PATCH] force pnpm v10 in dockerfile

---
 .github/workflows/publish-docker-auto.yml | 14 +++++++++-----
 Dockerfile                                |  3 ++-
 package.json                              |  1 +
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/publish-docker-auto.yml b/.github/workflows/publish-docker-auto.yml
index cdbe1189e..b6bc0d348 100644
--- a/.github/workflows/publish-docker-auto.yml
+++ b/.github/workflows/publish-docker-auto.yml
@@ -4,6 +4,11 @@ permissions: write-all
 
 on:
     workflow_dispatch:
+        inputs:
+            tag:
+                description: 'Docker image tag (e.g. 1.12.0 or latest)'
+                required: true
+                type: string
     push:
         tags:
             - 'v*.*.*'
@@ -33,11 +38,10 @@ jobs:
               with:
                   images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
                   tags: |
-                      type=ref,event=branch
-                      type=ref,event=pr
-                      type=semver,pattern={{version}}
-                      type=semver,pattern={{major}}.{{minor}}
-                      type=semver,pattern={{major}}
+                      type=raw,value=${{ inputs.tag }},enable=${{ github.event_name == 'workflow_dispatch' }}
+                      type=semver,pattern={{version}},enable=${{ github.event_name == 'push' }}
+                      type=semver,pattern={{major}}.{{minor}},enable=${{ github.event_name == 'push' }}
+                      type=semver,pattern={{major}},enable=${{ github.event_name == 'push' }}
             - name: Set up QEMU
               uses: docker/setup-qemu-action@v3
             - name: Setup Docker buildx
diff --git a/Dockerfile b/Dockerfile
index d2ab73524..7d958c1d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,8 @@ WORKDIR /app
 # Copy package.json first to cache node_modules
 COPY package.json pnpm-lock.yaml .
 
-RUN npm install -g pnpm
+# Match CI (pnpm/action-setup version: 10). Latest pnpm 11 fails install without approve-builds.
+RUN corepack enable && corepack prepare pnpm@10 --activate
 
 RUN pnpm install
 
diff --git a/package.json b/package.json
index 6ce4cf354..fbf00fafe 100644
--- a/package.json
+++ b/package.json
@@ -189,6 +189,7 @@
     "pnpm": {
         "onlyBuiltDependencies": [
             "electron",
+            "electron-winstaller",
             "esbuild"
         ]
     },