From ff10225fc4e7041b6612cc4e4398a81f69babb2e Mon Sep 17 00:00:00 2001 From: Rauno Tegelmann Date: Wed, 24 Jul 2024 17:57:34 +0300 Subject: [PATCH 1/9] feat: enable support for ARMv7 devices resolves #171 --- .github/workflows/ci.yml | 2 +- .github/workflows/pre-release.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f14d03c..ad441b84 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: with: context: . push: true - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7 tags: | ghcr.io/raunot/plex-rewind:${{ github.sha }} build-args: | diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 9b91cda9..0f4c3a77 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -56,7 +56,7 @@ jobs: with: context: . push: true - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7 tags: | ghcr.io/raunot/plex-rewind:develop ghcr.io/raunot/plex-rewind:${{ env.NEXT_VERSION_TAG }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9de21e48..dbcd295f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,7 +61,7 @@ jobs: with: context: . push: true - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7 tags: | ghcr.io/raunot/plex-rewind:latest ghcr.io/raunot/plex-rewind:${{ env.NEXT_VERSION_TAG }} From a31378be2045f78a656e2199119fcfb9f80f448a Mon Sep 17 00:00:00 2001 From: Rauno Tegelmann Date: Wed, 4 Dec 2024 18:39:48 +0200 Subject: [PATCH 2/9] fix: disable swcMinify --- next.config.mjs | 1 + 1 file changed, 1 insertion(+) diff --git a/next.config.mjs b/next.config.mjs index 6938b964..d46fd7f6 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -20,6 +20,7 @@ const nextConfig = { }, ], }, + swcMinify: false, // logging: { // fetches: { // fullUrl: true, From 7096fd61761a3d404cc78bdf92b28a452f061a77 Mon Sep 17 00:00:00 2001 From: Rauno Tegelmann Date: Wed, 4 Dec 2024 18:50:50 +0200 Subject: [PATCH 3/9] fix: update babel --- .babelrc | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .babelrc diff --git a/.babelrc b/.babelrc new file mode 100644 index 00000000..1ff94f7e --- /dev/null +++ b/.babelrc @@ -0,0 +1,3 @@ +{ + "presets": ["next/babel"] +} From 5ae398f79a43ba809427f734f9373a6645c15042 Mon Sep 17 00:00:00 2001 From: Rauno Tegelmann Date: Wed, 4 Dec 2024 18:54:50 +0200 Subject: [PATCH 4/9] build: use regular node:22 image --- .babelrc | 3 --- Dockerfile | 2 +- next.config.mjs | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 .babelrc diff --git a/.babelrc b/.babelrc deleted file mode 100644 index 1ff94f7e..00000000 --- a/.babelrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "presets": ["next/babel"] -} diff --git a/Dockerfile b/Dockerfile index ad4d039c..a4d508d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22-slim AS base +FROM node:22 AS base # Install dependencies only when needed FROM base AS deps diff --git a/next.config.mjs b/next.config.mjs index d46fd7f6..6938b964 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -20,7 +20,6 @@ const nextConfig = { }, ], }, - swcMinify: false, // logging: { // fetches: { // fullUrl: true, From c6f964c4a7b100a2ece86722f59c37d2d847f754 Mon Sep 17 00:00:00 2001 From: Rauno Tegelmann Date: Sun, 20 Apr 2025 13:04:49 +0300 Subject: [PATCH 5/9] build: try using slim image again --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 34e6f053..9a76b8e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker.io/docker/dockerfile:1 -FROM node:22-alpine AS base +FROM node:22-slim AS base # Install dependencies only when needed FROM base AS deps From 87090398c3fb8b4164b18285a316d23a784edca0 Mon Sep 17 00:00:00 2001 From: Rauno Tegelmann Date: Sun, 20 Apr 2025 13:07:57 +0300 Subject: [PATCH 6/9] build: try to use regular node image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9a76b8e3..fdbaa57c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker.io/docker/dockerfile:1 -FROM node:22-slim AS base +FROM node:22 AS base # Install dependencies only when needed FROM base AS deps From 347f895cc5fba4975b76f7691575c7d8b2b28785 Mon Sep 17 00:00:00 2001 From: Rauno Tegelmann Date: Sun, 20 Apr 2025 13:13:09 +0300 Subject: [PATCH 7/9] build: retry with slim --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index fdbaa57c..9d94fa27 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ # syntax=docker.io/docker/dockerfile:1 -FROM node:22 AS base +FROM node:22-slim AS base # Install dependencies only when needed FROM base AS deps # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed. -RUN apk add --no-cache libc6-compat WORKDIR /app # Install dependencies based on the preferred package manager @@ -40,7 +39,7 @@ FROM base AS runner WORKDIR /app # Install openssl in the runner stage -RUN apk add --no-cache openssl +RUN apt-get update && apt-get install -y --no-install-recommends openssl && rm -rf /var/lib/apt/lists/* ENV NODE_ENV=production ENV BASE_DIR=/app From 0d79fdea9d496106b5a706fd88e546e239db0c00 Mon Sep 17 00:00:00 2001 From: Rauno Tegelmann Date: Sun, 20 Apr 2025 13:35:03 +0300 Subject: [PATCH 8/9] chore: clean up comment --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9d94fa27..06a31433 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,6 @@ FROM node:22-slim AS base # Install dependencies only when needed FROM base AS deps -# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed. WORKDIR /app # Install dependencies based on the preferred package manager @@ -39,7 +38,7 @@ FROM base AS runner WORKDIR /app # Install openssl in the runner stage -RUN apt-get update && apt-get install -y --no-install-recommends openssl && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install openssl ENV NODE_ENV=production ENV BASE_DIR=/app From d4928ae22fc5686c6e57672621b0d7ba0e9f3449 Mon Sep 17 00:00:00 2001 From: Rauno Tegelmann Date: Sun, 20 Apr 2025 13:41:55 +0300 Subject: [PATCH 9/9] fix: openssl install --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 06a31433..8f1406dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,7 +38,7 @@ FROM base AS runner WORKDIR /app # Install openssl in the runner stage -RUN apt-get update && apt-get install openssl +RUN apt-get update && apt-get install -y --no-install-recommends openssl ENV NODE_ENV=production ENV BASE_DIR=/app