From 3a593d9d7686b94ec4ada025ddb8d16a31f6d04d Mon Sep 17 00:00:00 2001 From: Ryan Cohen Date: Sun, 5 Nov 2023 22:40:03 +0900 Subject: [PATCH 1/4] build: update docker ubuntu images to 22.04 (#3671) --- .github/workflows/ci.yml | 6 +++--- .github/workflows/release.yml | 6 +++--- .github/workflows/snap.yaml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7920feb30..f4dbce35c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: test: name: Lint & Test Build if: github.event_name == 'pull_request' - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 container: node:20.9-alpine steps: - name: Checkout @@ -31,7 +31,7 @@ jobs: build_and_push: name: Build & Publish Docker Images 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: - name: Checkout uses: actions/checkout@v3 @@ -69,7 +69,7 @@ jobs: name: Send Discord Notification needs: build_and_push 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: - name: Get Build Job Status uses: technote-space/workflow-conclusion-action@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 22c815138..806d51bf0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: jobs: semantic-release: name: Tag and release latest version - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v3 @@ -45,7 +45,7 @@ jobs: build-snap: name: Build Snap Package (${{ matrix.architecture }}) needs: semantic-release - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: @@ -101,7 +101,7 @@ jobs: name: Send Discord Notification needs: semantic-release if: always() - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Get Build Job Status uses: technote-space/workflow-conclusion-action@v3 diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 880c1d9e7..16489a899 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -8,7 +8,7 @@ on: jobs: jobs: name: Job Check - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: "!contains(github.event.head_commit.message, '[skip ci]')" steps: - name: Cancel Previous Runs @@ -19,7 +19,7 @@ jobs: build-snap: name: Build Snap Package (${{ matrix.architecture }}) needs: jobs - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: @@ -67,7 +67,7 @@ jobs: name: Send Discord Notification needs: build-snap if: always() && !contains(github.event.head_commit.message, '[skip ci]') - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Get Build Job Status uses: technote-space/workflow-conclusion-action@v3 From 89287af096218f8a7e3d03fc1976fb2f37d3e91c Mon Sep 17 00:00:00 2001 From: Ryan Cohen Date: Mon, 6 Nov 2023 18:48:02 +0900 Subject: [PATCH 2/4] build: use node 18 (#3675) --- .github/workflows/ci.yml | 2 +- .github/workflows/preview.yml | 2 +- Dockerfile | 7 ++++--- Dockerfile.local | 2 +- snap/snapcraft.yaml | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4dbce35c..2be6b2e05 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: name: Lint & Test Build if: github.event_name == 'pull_request' runs-on: ubuntu-22.04 - container: node:20.9-alpine + container: node:18.18-alpine steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index e1e93de02..330644290 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -8,7 +8,7 @@ on: jobs: build_and_push: name: Build & Publish Docker Preview Images - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v3 diff --git a/Dockerfile b/Dockerfile index 85b703062..fee2e9762 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20.9-alpine AS BUILD_IMAGE +FROM node:18.18-alpine AS BUILD_IMAGE WORKDIR /app @@ -8,7 +8,8 @@ ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64} RUN \ case "${TARGETPLATFORM}" in \ 'linux/arm64' | 'linux/arm/v7') \ - apk add --no-cache python3 make g++ \ + apk add --no-cache python3 make g++ && \ + ln -s /usr/bin/python3 /usr/bin/python \ ;; \ esac @@ -32,7 +33,7 @@ RUN touch config/DOCKER RUN echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json -FROM node:20.9-alpine +FROM node:18.18-alpine WORKDIR /app diff --git a/Dockerfile.local b/Dockerfile.local index 0edc660bf..7efa68b51 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -1,4 +1,4 @@ -FROM node:20.9-alpine +FROM node:18.18-alpine COPY . /app WORKDIR /app diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 1010d6d35..3c7718a3a 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -16,9 +16,9 @@ architectures: parts: overseerr: plugin: nodejs - nodejs-version: '20.9.0' + nodejs-version: '18.8.2' nodejs-package-manager: 'yarn' - nodejs-yarn-version: v1.22.17 + nodejs-yarn-version: v1.22.19 build-packages: - git - on arm64: From e297d25603d95b3a08b724b909cfc4697915737d Mon Sep 17 00:00:00 2001 From: Ryan Cohen Date: Mon, 6 Nov 2023 18:56:57 +0900 Subject: [PATCH 3/4] build: add global node-gyp for arm (#3676) --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fee2e9762..949bf5962 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,9 @@ ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64} RUN \ case "${TARGETPLATFORM}" in \ 'linux/arm64' | 'linux/arm/v7') \ - apk add --no-cache python3 make g++ && \ - ln -s /usr/bin/python3 /usr/bin/python \ + apk update && \ + apk add --no-cache python3 make g++ gcc libc6-compat bash && \ + yarn global add node-gyp \ ;; \ esac From be047427df62e480fc9b69cb93258837ed72bcf4 Mon Sep 17 00:00:00 2001 From: Ryan Cohen Date: Mon, 6 Nov 2023 20:43:03 +0900 Subject: [PATCH 4/4] build: correct node version in snapcraft (#3678) --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 3c7718a3a..6faf23191 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -16,7 +16,7 @@ architectures: parts: overseerr: plugin: nodejs - nodejs-version: '18.8.2' + nodejs-version: '18.18.2' nodejs-package-manager: 'yarn' nodejs-yarn-version: v1.22.19 build-packages: