From 48edf2c2121da3ddce0581440081ff7a114cd8b6 Mon Sep 17 00:00:00 2001 From: whyour Date: Fri, 3 Feb 2023 22:38:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20ppc64le/s390x/386=20?= =?UTF-8?q?=E9=95=9C=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build_docker_image.yml | 2 +- docker/Dockerfile | 2 +- package.json | 2 +- pnpm-lock.yaml | 46 ++++++++++++------------ 4 files changed, 27 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build_docker_image.yml b/.github/workflows/build_docker_image.yml index 03c2a5d9..ba5e19fc 100644 --- a/.github/workflows/build_docker_image.yml +++ b/.github/workflows/build_docker_image.yml @@ -155,7 +155,7 @@ jobs: QL_BRANCH=${{ github.ref_name }} SOURCE_COMMIT=${{ github.sha }} network: host - platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 + platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x,linux/386 context: . file: ./docker/Dockerfile push: true diff --git a/docker/Dockerfile b/docker/Dockerfile index e671524b..f137d244 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,7 @@ FROM python:3.10-alpine as builder COPY package.json .npmrc pnpm-lock.yaml /tmp/build/ RUN set -x \ && apk update \ - && apk add nodejs npm \ + && apk add nodejs npm git \ && npm i -g pnpm \ && cd /tmp/build \ && pnpm install --prod diff --git a/package.json b/package.json index f0b5c2c5..1702f344 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "sequelize": "^6.25.5", "serve-handler": "^6.1.3", "sockjs": "^0.3.24", - "sqlite3": "npm:@louislam/sqlite3@15.1.2", + "sqlite3": "git+https://github.com/whyour/node-sqlite3.git", "toad-scheduler": "^1.6.0", "typedi": "^0.10.0", "uuid": "^8.3.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5dd39282..b371bda2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -80,7 +80,7 @@ specifiers: serve-handler: ^6.1.3 sockjs: ^0.3.24 sockjs-client: ^1.6.0 - sqlite3: npm:@louislam/sqlite3@15.1.2 + sqlite3: git+https://github.com/whyour/node-sqlite3.git toad-scheduler: ^1.6.0 ts-node: ^10.6.0 tslib: ^2.4.0 @@ -122,10 +122,10 @@ dependencies: nodemailer: 6.8.0 pstree.remy: 1.1.8 reflect-metadata: 0.1.13 - sequelize: 6.28.0_@louislam+sqlite3@15.1.2 + sequelize: 6.28.0_@whyour+sqlite3@1.0.1 serve-handler: 6.1.5 sockjs: 0.3.24 - sqlite3: /@louislam/sqlite3/15.1.2 + sqlite3: github.com/whyour/node-sqlite3/9be8123ad9c2b1e028e4dd61150db710bd7dd9cf toad-scheduler: 1.6.1 typedi: 0.10.0 uuid: 8.3.2 @@ -3171,23 +3171,6 @@ packages: react-is: 16.13.1 dev: true - /@louislam/sqlite3/15.1.2: - resolution: {integrity: sha512-VRquWrCKKwfOnzwVh6hOud8lHPvv2R7Jic3gyZCL5kiZpNfmJ71DLCV9SNgLaMDloU+mVWymLev8vehlf7xf5g==} - requiresBuild: true - peerDependenciesMeta: - node-gyp: - optional: true - dependencies: - '@mapbox/node-pre-gyp': 1.0.10 - node-addon-api: 4.3.0 - tar: 6.1.13 - optionalDependencies: - node-gyp: 7.1.2 - transitivePeerDependencies: - - encoding - - supports-color - dev: false - /@mapbox/node-pre-gyp/1.0.10: resolution: {integrity: sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==} hasBin: true @@ -13360,7 +13343,7 @@ packages: engines: {node: '>= 10.0.0'} dev: false - /sequelize/6.28.0_@louislam+sqlite3@15.1.2: + /sequelize/6.28.0_@whyour+sqlite3@1.0.1: resolution: {integrity: sha512-+WHqvUQgTp19GLkt+gyQ+F6qg+FIEO2O5F9C0TOYV/PjZ2a/XwWvVkL1NCkS4VSIjVVvAUutiW6Wv9ofveGaVw==} engines: {node: '>=10.0.0'} peerDependencies: @@ -13405,7 +13388,7 @@ packages: retry-as-promised: 7.0.3 semver: 7.3.8 sequelize-pool: 7.1.0 - sqlite3: /@louislam/sqlite3/15.1.2 + sqlite3: github.com/whyour/node-sqlite3/9be8123ad9c2b1e028e4dd61150db710bd7dd9cf toposort-class: 1.0.1 uuid: 8.3.2 validator: 13.7.0 @@ -15235,3 +15218,22 @@ packages: normalize-path: 1.0.0 strip-indent: 2.0.0 dev: true + + github.com/whyour/node-sqlite3/9be8123ad9c2b1e028e4dd61150db710bd7dd9cf: + resolution: {tarball: https://codeload.github.com/whyour/node-sqlite3/tar.gz/9be8123ad9c2b1e028e4dd61150db710bd7dd9cf} + name: '@whyour/sqlite3' + version: 1.0.1 + requiresBuild: true + peerDependenciesMeta: + node-gyp: + optional: true + dependencies: + '@mapbox/node-pre-gyp': 1.0.10 + node-addon-api: 4.3.0 + tar: 6.1.13 + optionalDependencies: + node-gyp: 7.1.2 + transitivePeerDependencies: + - encoding + - supports-color + dev: false