force pnpm v10 in dockerfile

This commit is contained in:
jeffvli
2026-05-25 22:00:28 -07:00
parent 2193fa4251
commit bf7ca937ff
3 changed files with 12 additions and 6 deletions
+9 -5
View File
@@ -4,6 +4,11 @@ permissions: write-all
on: on:
workflow_dispatch: workflow_dispatch:
inputs:
tag:
description: 'Docker image tag (e.g. 1.12.0 or latest)'
required: true
type: string
push: push:
tags: tags:
- 'v*.*.*' - 'v*.*.*'
@@ -33,11 +38,10 @@ jobs:
with: with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: | tags: |
type=ref,event=branch type=raw,value=${{ inputs.tag }},enable=${{ github.event_name == 'workflow_dispatch' }}
type=ref,event=pr type=semver,pattern={{version}},enable=${{ github.event_name == 'push' }}
type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}},enable=${{ github.event_name == 'push' }}
type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}},enable=${{ github.event_name == 'push' }}
type=semver,pattern={{major}}
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v3 uses: docker/setup-qemu-action@v3
- name: Setup Docker buildx - name: Setup Docker buildx
+2 -1
View File
@@ -5,7 +5,8 @@ WORKDIR /app
# Copy package.json first to cache node_modules # Copy package.json first to cache node_modules
COPY package.json pnpm-lock.yaml . 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 RUN pnpm install
+1
View File
@@ -189,6 +189,7 @@
"pnpm": { "pnpm": {
"onlyBuiltDependencies": [ "onlyBuiltDependencies": [
"electron", "electron",
"electron-winstaller",
"esbuild" "esbuild"
] ]
}, },