From 104f91e697d8c5c4bb71ce995c2b95ab75d84dae Mon Sep 17 00:00:00 2001
From: Uruk <uruknarb20@gmail.com>
Date: Fri, 23 Feb 2024 17:52:10 +0100
Subject: Refactor jellyfin-packaging  - Fix typo in the README  - Added -f to
 rm from fix https://github.com/jellyfin/jellyfin/pull/11008  - Apply fix from
 https://github.com/jellyfin/jellyfin/pull/10763  - Refactor Docker for better
 syntax and readability  - Update Intel runtime drivers to 24.05.28454.6  -
 Added possible miss line 159 docker/Dockerfile : "--ffmpeg",
 "/usr/lib/jellyfin-ffmpeg/ffmpeg"  - Removed wget in cleanup

---
 portable/Dockerfile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'portable/Dockerfile')

diff --git a/portable/Dockerfile b/portable/Dockerfile
index afe33d7..73856f1 100644
--- a/portable/Dockerfile
+++ b/portable/Dockerfile
@@ -26,11 +26,8 @@ RUN apt-get update -y \
  && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC \
     apt-get install --no-install-recommends -y \
     wget debhelper gnupg devscripts build-essential mmv lsb-release zip \
-    libssl*.* liblttng-ust* \
-    libfontconfig*-dev libcurl*openssl-dev libfreetype*-dev libssl-dev \
- && apt-get clean autoclean -y \
- && apt-get autoremove -y \
- && rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/*
+    libssl*.* liblttng-ust* libssl-dev \
+    libfontconfig*-dev libcurl*openssl-dev libfreetype*-dev
 
 # Prepare dotnet SDK
 RUN wget https://packages.microsoft.com/config/${PACKAGE_TYPE}/${PACKAGE_VERSION}/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
@@ -46,6 +43,12 @@ RUN wget https://deb.nodesource.com/setup_${NODEJS_VERSION}.x -O nodejs-install.
  && apt-get install -y \
     nodejs
 
+# Clean up dependencies
+RUN apt-get remove wget -y \
+ && apt-get clean autoclean -y \
+ && apt-get autoremove -y \
+ && rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/*
+
 # Link to build script
 RUN ln -sf ${SOURCE_DIR}/portable/build.sh /build.sh
 
-- 
cgit 


From 76a60266d1f05fc78a7607e3dbca68ca8615d8a3 Mon Sep 17 00:00:00 2001
From: Uruk <uruknarb20@gmail.com>
Date: Fri, 23 Feb 2024 18:24:32 +0100
Subject: Apply suggestions

---
 portable/Dockerfile | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'portable/Dockerfile')

diff --git a/portable/Dockerfile b/portable/Dockerfile
index 73856f1..a2fd069 100644
--- a/portable/Dockerfile
+++ b/portable/Dockerfile
@@ -25,9 +25,23 @@ ENV ARCHIVE_TYPES=targz
 RUN apt-get update -y \
  && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC \
     apt-get install --no-install-recommends -y \
-    wget debhelper gnupg devscripts build-essential mmv lsb-release zip \
-    libssl*.* liblttng-ust* libssl-dev \
-    libfontconfig*-dev libcurl*openssl-dev libfreetype*-dev
+    wget \
+    debhelper \
+    gnupg \
+    devscripts \
+    build-essential \
+    mmv \
+    lsb-release\
+    zip \
+    libssl*.* \
+    liblttng-ust*\
+    libssl-dev \
+    libfontconfig*-dev \
+    libcurl*openssl-dev \
+    libfreetype*-dev \
+ && apt-get clean autoclean -y \
+ && apt-get autoremove -y \
+ && rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/*
 
 # Prepare dotnet SDK
 RUN wget https://packages.microsoft.com/config/${PACKAGE_TYPE}/${PACKAGE_VERSION}/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-- 
cgit