From cf5ec3b319a780d0af0f4437e854dd31573733ff Mon Sep 17 00:00:00 2001
From: Harvey Tindall <hrfee@protonmail.ch>
Date: Sat, 10 Aug 2024 21:43:16 +0100
Subject: [PATCH] build: fix dockerfile for E2EE

---
 .goreleaser.yml | 4 ++--
 Dockerfile      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 56e1dc1..e654e54 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -26,8 +26,8 @@ builds:
       dir: ./
       env:
         - CGO_ENABLED=1
-        - CC={{ if eq .Arch "amd64" }}x86_64{{ else }}{{ .Arch }}{{ end }}-linux-gnu{{ if eq .Arch "arm" }}eabihf{{ end }}-gcc
-        - CXX={{ if eq .Arch "amd64" }}x86_64{{ else }}{{ .Arch }}{{ end }}-linux-gnu{{ if eq .Arch "arm" }}eabihf{{ end }}-gcc
+        - CC={{ if eq .Arch "amd64" }}x86_64{{ else if eq .Arch "arm64" }}aarch64{{ else }}{{ .Arch }}{{ end }}-linux-gnu{{ if eq .Arch "arm" }}eabihf{{ end }}-gcc
+        - CXX={{ if eq .Arch "amd64" }}x86_64{{ else if eq .Arch "arm64" }}aarch64{{ else }}{{ .Arch }}{{ end }}-linux-gnu{{ if eq .Arch "arm" }}eabihf{{ end }}-gcc
         - GOARM={{ if eq .Arch "arm" }}7{{ end }}
       flags:
         - -tags=e2ee
diff --git a/Dockerfile b/Dockerfile
index ee67fd7..1fcd04e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,19 +12,19 @@ COPY . /opt/build
 RUN (cd /opt/build; npm i; make precompile INTERNAL=off GOESBUILD=off) \
     && sed -i 's#id="password_resets-watch_directory" placeholder="/config/jellyfin"#id="password_resets-watch_directory" value="/jf" disabled#g' /opt/build/build/data/html/setup.html
 
-FROM --platform=$BUILDPLATFORM docker.io/golang:latest AS build
 ARG TARGETARCH
 ENV GOARCH=$TARGETARCH
 ARG BUILT_BY
 ENV BUILTBY=$BUILT_BY
 
-COPY --from=support /opt/build /opt/build
+RUN apt-get update -y && apt-get install libolm-dev -y
 
 RUN (cd /opt/build; make compile INTERNAL=off UPDATER=docker)
 
-FROM golang:latest
+FROM golang:bookworm
 
-COPY --from=build /opt/build/build /opt/jfa-go
+RUN apt-get update -y && apt-get install libolm-dev -y
+COPY --from=support /opt/build/build /opt/jfa-go
 
 EXPOSE 8056
 EXPOSE 8057