fix: 恢复 linux/s390x 镜像支持

Author: whyour

.github/workflows/build-docker-image.yml

@@ -212,7 +212,7 @@ jobs:
             QL_BRANCH=${{ github.ref_name }}
             SOURCE_COMMIT=${{ github.sha }}
           network: host
-          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/386
+          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x,linux/386
           context: .
           file: ./docker/Dockerfile
           push: true
@@ -290,6 +290,7 @@ jobs:
             QL_BRANCH=${{ github.ref_name }}
             SOURCE_COMMIT=${{ github.sha }}
           network: host
+          # Keep s390x on Debian: npm can hang under QEMU with Alpine (nodejs/docker-node#1973).
           platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
           context: .
           file: ./docker/Dockerfile.debian
@@ -354,7 +355,7 @@ jobs:
             QL_BRANCH=${{ github.ref_name }}
             SOURCE_COMMIT=${{ github.sha }}
           network: host
-          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/386
+          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x,linux/386
           context: .
           file: ./docker/Dockerfile.310
           push: true
@@ -419,6 +420,7 @@ jobs:
             QL_BRANCH=${{ github.ref_name }}
             SOURCE_COMMIT=${{ github.sha }}
           network: host
+          # Keep s390x on Debian: npm can hang under QEMU with Alpine (nodejs/docker-node#1973).
           platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
           context: .
           file: ./docker/Dockerfile.debian310

docker/Dockerfile

@@ -1,11 +1,26 @@
-FROM python:3.11-alpine3.18 AS builder
+# Run Node package installation natively on the builder. Node/npm can spin at
+# 100% CPU when Alpine s390x is emulated through QEMU.
+FROM --platform=$BUILDPLATFORM node:18-alpine3.18 AS builder
+
+ARG TARGETARCH
+ENV NPM_CONFIG_PREFIX=/opt/node-global
+ENV PATH=/opt/node-global/bin:${PATH}
+
 COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
 RUN set -x \
-  && apk update \
-  && apk add nodejs npm git \
+  && apk add --no-cache git \
   && npm i -g pnpm@8.3.1 pm2 ts-node typescript@5 \
   && cd /tmp/build \
-  && pnpm install --prod
+  && case "${TARGETARCH}" in \
+    amd64) NODE_ARCH=x64 ;; \
+    386) NODE_ARCH=ia32 ;; \
+    ppc64le) NODE_ARCH=ppc64 ;; \
+    *) NODE_ARCH="${TARGETARCH}" ;; \
+  esac \
+  && npm_config_target_platform=linux \
+    npm_config_target_arch="${NODE_ARCH}" \
+    npm_config_target_libc=musl \
+    pnpm install --prod
 
 FROM python:3.11-alpine
 
@@ -26,8 +41,8 @@ VOLUME /ql/data
 
 EXPOSE 5700
 
-COPY --from=builder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
-COPY --from=builder /usr/local/bin/. /usr/local/bin/
+COPY --from=builder /opt/node-global/lib/node_modules/. /usr/local/lib/node_modules/
+COPY --from=builder /opt/node-global/bin/. /usr/local/bin/
 
 RUN set -x \
   && apk update -f \

docker/Dockerfile.310

@@ -1,11 +1,26 @@
-FROM python:3.10-alpine3.18 AS builder
+# Run Node package installation natively on the builder. Node/npm can spin at
+# 100% CPU when Alpine s390x is emulated through QEMU.
+FROM --platform=$BUILDPLATFORM node:18-alpine3.18 AS builder
+
+ARG TARGETARCH
+ENV NPM_CONFIG_PREFIX=/opt/node-global
+ENV PATH=/opt/node-global/bin:${PATH}
+
 COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
 RUN set -x \
-  && apk update \
-  && apk add nodejs npm git \
+  && apk add --no-cache git \
   && npm i -g pnpm@8.3.1 pm2 ts-node typescript@5 \
   && cd /tmp/build \
-  && pnpm install --prod
+  && case "${TARGETARCH}" in \
+    amd64) NODE_ARCH=x64 ;; \
+    386) NODE_ARCH=ia32 ;; \
+    ppc64le) NODE_ARCH=ppc64 ;; \
+    *) NODE_ARCH="${TARGETARCH}" ;; \
+  esac \
+  && npm_config_target_platform=linux \
+    npm_config_target_arch="${NODE_ARCH}" \
+    npm_config_target_libc=musl \
+    pnpm install --prod
 
 FROM python:3.10-alpine
 
@@ -26,8 +41,8 @@ VOLUME /ql/data
 
 EXPOSE 5700
 
-COPY --from=builder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
-COPY --from=builder /usr/local/bin/. /usr/local/bin/
+COPY --from=builder /opt/node-global/lib/node_modules/. /usr/local/lib/node_modules/
+COPY --from=builder /opt/node-global/bin/. /usr/local/bin/
 
 RUN set -x \
   && apk update -f \

docker/Dockerfile.debian

@@ -1,4 +1,6 @@
-FROM node:22-slim AS nodebuilder
+# Node 20 Bookworm is the latest official Node image variant that covers the
+# full Debian build matrix, including arm/v7, ppc64le, and s390x.
+FROM node:20-bookworm-slim AS nodebuilder
 
 FROM python:3.11-slim-bookworm AS builder
 COPY package.json .npmrc pnpm-lock.yaml /tmp/build/

docker/Dockerfile.debian310

@@ -1,4 +1,6 @@
-FROM node:22-slim AS nodebuilder
+# Node 20 Bookworm is the latest official Node image variant that covers the
+# full Debian build matrix, including arm/v7, ppc64le, and s390x.
+FROM node:20-bookworm-slim AS nodebuilder
 
 FROM python:3.10-slim-bookworm AS builder
 COPY package.json .npmrc pnpm-lock.yaml /tmp/build/

package.json

@@ -67,7 +67,7 @@
       }
     },
     "overrides": {
-      "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.3",
+      "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.1.0",
       "@codemirror/state": "6.5.4",
       "@codemirror/view": "6.39.16"
     }
@@ -111,7 +111,7 @@
     "request-ip": "3.3.0",
     "sequelize": "^6.37.5",
     "sockjs": "^0.3.24",
-    "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.3",
+    "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.1.0",
     "toad-scheduler": "^3.0.1",
     "typedi": "^0.10.0",
     "undici": "^7.9.0",