From 40d17bf042900e385a4461a177f1983add150036 Mon Sep 17 00:00:00 2001
From: Zed <zedeus@pm.me>
Date: Sun, 7 Jun 2026 00:43:29 +0200
Subject: [PATCH] Use Nim 2.2.6 for Docker builds, unify arm64

nimlang/nim's alpine-regular images cap at 2.2.6 and are now
multi-arch, while Alpine's apk nim is stuck at the segfaulting
2.2.0. Base both arches on 2.2.6-alpine-regular, drop the
separate Dockerfile.arm64, and build ./Dockerfile in the arm64
CI job.

Fixes #1404
---
 .github/workflows/build-docker.yml |  2 +-
 Dockerfile                         |  4 ++--
 Dockerfile.arm64                   | 25 -------------------------
 3 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 Dockerfile.arm64

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 7a46257..9a6c490 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -55,7 +55,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
-          file: ./Dockerfile.arm64
+          file: ./Dockerfile
           platforms: linux/arm64
           push: true
           tags: zedeus/nitter:latest-arm64,zedeus/nitter:${{ github.sha }}-arm64
diff --git a/Dockerfile b/Dockerfile
index ab442ba..251b63a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM nimlang/nim:2.2.0-alpine-regular as nim
+FROM nimlang/nim:2.2.6-alpine-regular as nim
 LABEL maintainer="setenforce@protonmail.com"
 
 RUN apk --no-cache add libsass-dev pcre
@@ -15,7 +15,7 @@ RUN nimble build -d:danger -d:lto -d:strip --mm:refc \
 
 FROM alpine:latest
 WORKDIR /src/
-RUN apk --no-cache add pcre ca-certificates
+RUN apk --no-cache add pcre ca-certificates openssl
 COPY --from=nim /src/nitter/nitter ./
 COPY --from=nim /src/nitter/nitter.example.conf ./nitter.conf
 COPY --from=nim /src/nitter/public ./public
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
deleted file mode 100644
index 46352c7..0000000
--- a/Dockerfile.arm64
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM alpine:3.20.6 as nim
-LABEL maintainer="setenforce@protonmail.com"
-
-RUN apk --no-cache add libsass-dev pcre gcc git libc-dev nim nimble
-
-WORKDIR /src/nitter
-
-COPY nitter.nimble .
-RUN nimble install -y --depsOnly
-
-COPY . .
-RUN nimble build -d:danger -d:lto -d:strip --mm:refc \
-    && nimble scss \
-    && nimble md
-
-FROM alpine:3.20.6
-WORKDIR /src/
-RUN apk --no-cache add pcre ca-certificates openssl
-COPY --from=nim /src/nitter/nitter ./
-COPY --from=nim /src/nitter/nitter.example.conf ./nitter.conf
-COPY --from=nim /src/nitter/public ./public
-EXPOSE 8080
-RUN adduser -h /src/ -D -s /bin/sh nitter
-USER nitter
-CMD ./nitter