diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 33064429..d7cfc848 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -35,7 +35,7 @@ jobs: with: context: . file: ./Dockerfile - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 push: true build-args: | COMMIT_TAG=${{ github.sha }} diff --git a/Dockerfile b/Dockerfile index 949bf596..0ff98baf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,14 +5,14 @@ WORKDIR /app ARG TARGETPLATFORM ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64} -RUN \ - case "${TARGETPLATFORM}" in \ - 'linux/arm64' | 'linux/arm/v7') \ - apk update && \ - apk add --no-cache python3 make g++ gcc libc6-compat bash && \ - yarn global add node-gyp \ - ;; \ - esac +# RUN \ +# case "${TARGETPLATFORM}" in \ +# 'linux/arm64' | 'linux/arm/v7') \ +# apk update && \ +# apk add --no-cache python3 make g++ gcc libc6-compat bash && \ +# yarn global add node-gyp \ +# ;; \ +# esac COPY package.json yarn.lock ./ RUN CYPRESS_INSTALL_BINARY=0 yarn install --frozen-lockfile --network-timeout 1000000 diff --git a/package.json b/package.json index 8b82e45d..05260550 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,6 @@ "lodash": "4.17.21", "next": "12.3.4", "node-cache": "5.1.2", - "node-gyp": "9.3.1", "node-schedule": "2.1.1", "nodemailer": "6.9.1", "openpgp": "5.7.0", @@ -86,7 +85,7 @@ "reflect-metadata": "0.1.13", "secure-random-password": "0.2.3", "semver": "7.3.8", - "sqlite3": "5.1.4", + "sqlite3": "5.1.6", "swagger-ui-express": "4.6.2", "swr": "2.0.4", "typeorm": "0.3.12", @@ -166,7 +165,6 @@ "typescript": "4.9.5" }, "resolutions": { - "sqlite3/node-gyp": "8.4.1", "@types/react": "18.0.28", "@types/react-dom": "18.0.11", "@types/express-session": "1.17.6" diff --git a/yarn.lock b/yarn.lock index 886aee53..a3ccd2d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10179,7 +10179,7 @@ node-fetch@^2.6.0, node-fetch@^2.6.7: dependencies: whatwg-url "^5.0.0" -node-gyp@8.4.1, node-gyp@8.x: +node-gyp@8.x: version "8.4.1" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937" integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w== @@ -10195,7 +10195,7 @@ node-gyp@8.4.1, node-gyp@8.x: tar "^6.1.2" which "^2.0.2" -node-gyp@9.3.1, node-gyp@^9.0.0, node-gyp@^9.1.0: +node-gyp@^9.0.0, node-gyp@^9.1.0: version "9.3.1" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.1.tgz#1e19f5f290afcc9c46973d68700cbd21a96192e4" integrity sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg== @@ -12603,10 +12603,10 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== -sqlite3@5.1.4: - version "5.1.4" - resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.1.4.tgz#35f83d368963168b324ad2f0fffce09f3b8723a7" - integrity sha512-i0UlWAzPlzX3B5XP2cYuhWQJsTtlMD6obOa1PgeEQ4DHEXUuyJkgv50I3isqZAP5oFc2T8OFvakmDh2W6I+YpA== +sqlite3@5.1.6: + version "5.1.6" + resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.1.6.tgz#1d4fbc90fe4fbd51e952e0a90fd8f6c2b9098e97" + integrity sha512-olYkWoKFVNSSSQNvxVUfjiVbz3YtBwTJj+mfV5zpHmqW3sELx2Cf4QCdirMelhM5Zh+KDVaKgQHqCxrqiWHybw== dependencies: "@mapbox/node-pre-gyp" "^1.0.0" node-addon-api "^4.2.0"