@whyour/qinglong 2.21.0-13 → 2.21.0-14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/docker/Dockerfile +21 -6
  2. package/docker/Dockerfile.310 +21 -6
  3. package/docker/Dockerfile.debian +3 -1
  4. package/docker/Dockerfile.debian310 +3 -1
  5. package/package.json +3 -3
package/docker/Dockerfile CHANGED
@@ -1,11 +1,26 @@
1
- FROM python:3.11-alpine3.18 AS builder
1
+ # Run Node package installation natively on the builder. Node/npm can spin at
2
+ # 100% CPU when Alpine s390x is emulated through QEMU.
3
+ FROM --platform=$BUILDPLATFORM node:18-alpine3.18 AS builder
4
+
5
+ ARG TARGETARCH
6
+ ENV NPM_CONFIG_PREFIX=/opt/node-global
7
+ ENV PATH=/opt/node-global/bin:${PATH}
8
+
2
9
  COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
3
10
  RUN set -x \
4
- && apk update \
5
- && apk add nodejs npm git \
11
+ && apk add --no-cache git \
6
12
  && npm i -g pnpm@8.3.1 pm2 ts-node typescript@5 \
7
13
  && cd /tmp/build \
8
- && pnpm install --prod
14
+ && case "${TARGETARCH}" in \
15
+ amd64) NODE_ARCH=x64 ;; \
16
+ 386) NODE_ARCH=ia32 ;; \
17
+ ppc64le) NODE_ARCH=ppc64 ;; \
18
+ *) NODE_ARCH="${TARGETARCH}" ;; \
19
+ esac \
20
+ && npm_config_target_platform=linux \
21
+ npm_config_target_arch="${NODE_ARCH}" \
22
+ npm_config_target_libc=musl \
23
+ pnpm install --prod
9
24
 
10
25
  FROM python:3.11-alpine
11
26
 
@@ -26,8 +41,8 @@ VOLUME /ql/data
26
41
 
27
42
  EXPOSE 5700
28
43
 
29
- COPY --from=builder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
30
- COPY --from=builder /usr/local/bin/. /usr/local/bin/
44
+ COPY --from=builder /opt/node-global/lib/node_modules/. /usr/local/lib/node_modules/
45
+ COPY --from=builder /opt/node-global/bin/. /usr/local/bin/
31
46
 
32
47
  RUN set -x \
33
48
  && apk update -f \
package/docker/Dockerfile.310 CHANGED
@@ -1,11 +1,26 @@
1
- FROM python:3.10-alpine3.18 AS builder
1
+ # Run Node package installation natively on the builder. Node/npm can spin at
2
+ # 100% CPU when Alpine s390x is emulated through QEMU.
3
+ FROM --platform=$BUILDPLATFORM node:18-alpine3.18 AS builder
4
+
5
+ ARG TARGETARCH
6
+ ENV NPM_CONFIG_PREFIX=/opt/node-global
7
+ ENV PATH=/opt/node-global/bin:${PATH}
8
+
2
9
  COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
3
10
  RUN set -x \
4
- && apk update \
5
- && apk add nodejs npm git \
11
+ && apk add --no-cache git \
6
12
  && npm i -g pnpm@8.3.1 pm2 ts-node typescript@5 \
7
13
  && cd /tmp/build \
8
- && pnpm install --prod
14
+ && case "${TARGETARCH}" in \
15
+ amd64) NODE_ARCH=x64 ;; \
16
+ 386) NODE_ARCH=ia32 ;; \
17
+ ppc64le) NODE_ARCH=ppc64 ;; \
18
+ *) NODE_ARCH="${TARGETARCH}" ;; \
19
+ esac \
20
+ && npm_config_target_platform=linux \
21
+ npm_config_target_arch="${NODE_ARCH}" \
22
+ npm_config_target_libc=musl \
23
+ pnpm install --prod
9
24
 
10
25
  FROM python:3.10-alpine
11
26
 
@@ -26,8 +41,8 @@ VOLUME /ql/data
26
41
 
27
42
  EXPOSE 5700
28
43
 
29
- COPY --from=builder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
30
- COPY --from=builder /usr/local/bin/. /usr/local/bin/
44
+ COPY --from=builder /opt/node-global/lib/node_modules/. /usr/local/lib/node_modules/
45
+ COPY --from=builder /opt/node-global/bin/. /usr/local/bin/
31
46
 
32
47
  RUN set -x \
33
48
  && apk update -f \
package/docker/Dockerfile.debian CHANGED
@@ -1,4 +1,6 @@
1
- FROM node:22-slim AS nodebuilder
1
+ # Node 20 Bookworm is the latest official Node image variant that covers the
2
+ # full Debian build matrix, including arm/v7, ppc64le, and s390x.
3
+ FROM node:20-bookworm-slim AS nodebuilder
2
4
 
3
5
  FROM python:3.11-slim-bookworm AS builder
4
6
  COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
package/docker/Dockerfile.debian310 CHANGED
@@ -1,4 +1,6 @@
1
- FROM node:22-slim AS nodebuilder
1
+ # Node 20 Bookworm is the latest official Node image variant that covers the
2
+ # full Debian build matrix, including arm/v7, ppc64le, and s390x.
3
+ FROM node:20-bookworm-slim AS nodebuilder
2
4
 
3
5
  FROM python:3.10-slim-bookworm AS builder
4
6
  COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@whyour/qinglong",
3
3
  "packageManager": "pnpm@8.3.1",
4
- "version": "2.21.0-13",
4
+ "version": "2.21.0-14",
5
5
  "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
6
6
  "repository": {
7
7
  "type": "git",
@@ -65,7 +65,7 @@
65
65
  }
66
66
  },
67
67
  "overrides": {
68
- "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.3",
68
+ "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.1.0",
69
69
  "@codemirror/state": "6.5.4",
70
70
  "@codemirror/view": "6.39.16"
71
71
  }
@@ -109,7 +109,7 @@
109
109
  "request-ip": "3.3.0",
110
110
  "sequelize": "^6.37.5",
111
111
  "sockjs": "^0.3.24",
112
- "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.3",
112
+ "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.1.0",
113
113
  "toad-scheduler": "^3.0.1",
114
114
  "typedi": "^0.10.0",
115
115
  "undici": "^7.9.0",