From 5cd77d5a86c5eda3c9c865f421961894c5807a6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Fri, 2 May 2025 02:08:25 +0300
Subject: [PATCH] Refactor docker build using build cache and multiline script

---
 Dockerfile | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 70ba43b..cf35c7e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,16 +33,29 @@ ARG JELLYFIN_VERSION=4.4.1-4
 # COPY qemu-arm-static /usr/bin/qemu-arm-static
 
 
-# RUN apt update and install wget
-RUN apt -y update && apt -y install wget
-RUN wget https://repo.jellyfin.org/archive/ffmpeg/debian/4.4.1-4/jellyfin-ffmpeg_4.4.1-4-buster_$(dpkg --print-architecture).deb -O jellyfin-ffmpeg_4.4.1-4-buster.deb
-RUN apt -y install ./jellyfin-ffmpeg_4.4.1-4-buster.deb
-RUN rm jellyfin-ffmpeg_4.4.1-4-buster.deb
-
-# RUN apt install -y bash
-COPY download_server.sh download_server.sh
-# RUN /bin/bash -c download_server.sh
-RUN ./download_server.sh
+# Install jellyfin-ffmpeg
+RUN \
+  --mount=type=cache,id=apt,target=/var/cache/apt \
+  --mount=type=cache,id=apt-lists,target=/var/lib/apt/lists \
+  <<eot
+  set -xeu
+
+  export DEBIAN_FRONTEND=noninteractive
+  apt-get update -qq
+
+  os=$(. /etc/os-release; echo "$VERSION_CODENAME")
+  arch=$(dpkg --print-architecture)
+  version="$JELLYFIN_VERSION"
+  url="https://repo.jellyfin.org/archive/ffmpeg/debian/${version}/jellyfin-ffmpeg_${version}-${os}_${arch}.deb"
+  deb=/tmp/jellyfin-ffmpeg.deb
+
+  curl -sSfL -o "$deb" "$url"
+  apt -y install "$deb"
+  rm "$deb"
+eot
+
+# Run download_server.sh
+RUN curl -sSfL -O https://dl.strem.io/server/${VERSION}/${BUILD}/server.js
 
 # This copy could will override the server.js that was downloaded with the one provided in this folder
 # for custom or manual builds if $VERSION argument is not empty.