Compare commits

...

5 Commits

Author SHA1 Message Date
sct
b4c29acc9e build: try to fix sqlite for arm 2023-11-06 10:04:14 +00:00
sct
e3c2c1c2d5 build: add global node-gyp for arm 2023-11-06 09:56:33 +00:00
Ryan Cohen
89287af096 build: use node 18 (#3675) 2023-11-06 18:48:02 +09:00
Ryan Cohen
3a593d9d76 build: update docker ubuntu images to 22.04 (#3671) 2023-11-05 22:40:03 +09:00
Ryan Cohen
a45fc86032 build: do not link python for arm (#3670) 2023-11-05 20:43:58 +09:00
9 changed files with 26 additions and 26 deletions

View File

@@ -12,8 +12,8 @@ jobs:
test: test:
name: Lint & Test Build name: Lint & Test Build
if: github.event_name == 'pull_request' if: github.event_name == 'pull_request'
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
container: node:20.9-alpine container: node:18.18-alpine
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
@@ -31,7 +31,7 @@ jobs:
build_and_push: build_and_push:
name: Build & Publish Docker Images name: Build & Publish Docker Images
if: github.ref == 'refs/heads/develop' && !contains(github.event.head_commit.message, '[skip ci]') if: github.ref == 'refs/heads/develop' && !contains(github.event.head_commit.message, '[skip ci]')
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
@@ -69,7 +69,7 @@ jobs:
name: Send Discord Notification name: Send Discord Notification
needs: build_and_push needs: build_and_push
if: always() && github.event_name != 'pull_request' && !contains(github.event.head_commit.message, '[skip ci]') if: always() && github.event_name != 'pull_request' && !contains(github.event.head_commit.message, '[skip ci]')
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- name: Get Build Job Status - name: Get Build Job Status
uses: technote-space/workflow-conclusion-action@v3 uses: technote-space/workflow-conclusion-action@v3

View File

@@ -8,7 +8,7 @@ on:
jobs: jobs:
build_and_push: build_and_push:
name: Build & Publish Docker Preview Images name: Build & Publish Docker Preview Images
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
@@ -35,7 +35,7 @@ jobs:
with: with:
context: . context: .
file: ./Dockerfile file: ./Dockerfile
platforms: linux/amd64 platforms: linux/amd64,linux/arm64,linux/arm/v7
push: true push: true
build-args: | build-args: |
COMMIT_TAG=${{ github.sha }} COMMIT_TAG=${{ github.sha }}

View File

@@ -8,7 +8,7 @@ on:
jobs: jobs:
semantic-release: semantic-release:
name: Tag and release latest version name: Tag and release latest version
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
@@ -45,7 +45,7 @@ jobs:
build-snap: build-snap:
name: Build Snap Package (${{ matrix.architecture }}) name: Build Snap Package (${{ matrix.architecture }})
needs: semantic-release needs: semantic-release
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@@ -101,7 +101,7 @@ jobs:
name: Send Discord Notification name: Send Discord Notification
needs: semantic-release needs: semantic-release
if: always() if: always()
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- name: Get Build Job Status - name: Get Build Job Status
uses: technote-space/workflow-conclusion-action@v3 uses: technote-space/workflow-conclusion-action@v3

View File

@@ -8,7 +8,7 @@ on:
jobs: jobs:
jobs: jobs:
name: Job Check name: Job Check
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
if: "!contains(github.event.head_commit.message, '[skip ci]')" if: "!contains(github.event.head_commit.message, '[skip ci]')"
steps: steps:
- name: Cancel Previous Runs - name: Cancel Previous Runs
@@ -19,7 +19,7 @@ jobs:
build-snap: build-snap:
name: Build Snap Package (${{ matrix.architecture }}) name: Build Snap Package (${{ matrix.architecture }})
needs: jobs needs: jobs
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@@ -67,7 +67,7 @@ jobs:
name: Send Discord Notification name: Send Discord Notification
needs: build-snap needs: build-snap
if: always() && !contains(github.event.head_commit.message, '[skip ci]') if: always() && !contains(github.event.head_commit.message, '[skip ci]')
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- name: Get Build Job Status - name: Get Build Job Status
uses: technote-space/workflow-conclusion-action@v3 uses: technote-space/workflow-conclusion-action@v3

View File

@@ -1,4 +1,4 @@
FROM node:20.9-alpine AS BUILD_IMAGE FROM node:18.18-alpine AS BUILD_IMAGE
WORKDIR /app WORKDIR /app
@@ -8,8 +8,9 @@ ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
RUN \ RUN \
case "${TARGETPLATFORM}" in \ case "${TARGETPLATFORM}" in \
'linux/arm64' | 'linux/arm/v7') \ 'linux/arm64' | 'linux/arm/v7') \
apk add --no-cache python3 make g++ && \ apk update && \
ln -s /usr/bin/python3 /usr/bin/python \ apk add --no-cache python3 make g++ gcc libc6-compat bash && \
yarn global add node-gyp \
;; \ ;; \
esac esac
@@ -33,7 +34,7 @@ RUN touch config/DOCKER
RUN echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json RUN echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json
FROM node:20.9-alpine FROM node:18.18-alpine
WORKDIR /app WORKDIR /app

View File

@@ -1,4 +1,4 @@
FROM node:20.9-alpine FROM node:18.18-alpine
COPY . /app COPY . /app
WORKDIR /app WORKDIR /app

View File

@@ -86,7 +86,7 @@
"reflect-metadata": "0.1.13", "reflect-metadata": "0.1.13",
"secure-random-password": "0.2.3", "secure-random-password": "0.2.3",
"semver": "7.3.8", "semver": "7.3.8",
"sqlite3": "5.1.4", "sqlite3": "5.1.6",
"swagger-ui-express": "4.6.2", "swagger-ui-express": "4.6.2",
"swr": "2.0.4", "swr": "2.0.4",
"typeorm": "0.3.12", "typeorm": "0.3.12",
@@ -166,7 +166,6 @@
"typescript": "4.9.5" "typescript": "4.9.5"
}, },
"resolutions": { "resolutions": {
"sqlite3/node-gyp": "8.4.1",
"@types/react": "18.0.28", "@types/react": "18.0.28",
"@types/react-dom": "18.0.11", "@types/react-dom": "18.0.11",
"@types/express-session": "1.17.6" "@types/express-session": "1.17.6"

View File

@@ -16,9 +16,9 @@ architectures:
parts: parts:
overseerr: overseerr:
plugin: nodejs plugin: nodejs
nodejs-version: '20.9.0' nodejs-version: '18.8.2'
nodejs-package-manager: 'yarn' nodejs-package-manager: 'yarn'
nodejs-yarn-version: v1.22.17 nodejs-yarn-version: v1.22.19
build-packages: build-packages:
- git - git
- on arm64: - on arm64:

View File

@@ -10179,7 +10179,7 @@ node-fetch@^2.6.0, node-fetch@^2.6.7:
dependencies: dependencies:
whatwg-url "^5.0.0" whatwg-url "^5.0.0"
node-gyp@8.4.1, node-gyp@8.x: node-gyp@8.x:
version "8.4.1" version "8.4.1"
resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937"
integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w== integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==
@@ -12603,10 +12603,10 @@ sprintf-js@~1.0.2:
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
sqlite3@5.1.4: sqlite3@5.1.6:
version "5.1.4" version "5.1.6"
resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.1.4.tgz#35f83d368963168b324ad2f0fffce09f3b8723a7" resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.1.6.tgz#1d4fbc90fe4fbd51e952e0a90fd8f6c2b9098e97"
integrity sha512-i0UlWAzPlzX3B5XP2cYuhWQJsTtlMD6obOa1PgeEQ4DHEXUuyJkgv50I3isqZAP5oFc2T8OFvakmDh2W6I+YpA== integrity sha512-olYkWoKFVNSSSQNvxVUfjiVbz3YtBwTJj+mfV5zpHmqW3sELx2Cf4QCdirMelhM5Zh+KDVaKgQHqCxrqiWHybw==
dependencies: dependencies:
"@mapbox/node-pre-gyp" "^1.0.0" "@mapbox/node-pre-gyp" "^1.0.0"
node-addon-api "^4.2.0" node-addon-api "^4.2.0"