[PR #10603] [MERGED] Refactor Dockerfile and build #12374

New issue

Closed

opened 2025-12-22 09:16:11 +01:00 by backuprepo · 0 comments

backuprepo commented

2025-12-22 09:16:11 +01:00

Owner

📋 Pull Request Information

Original PR: https://github.com/jellyfin/jellyfin/pull/10603
Author: @Gauvino
Created: 11/18/2023
Status: ✅ Merged
Merged: 1/18/2024
Merged by: @crobibero

Base: master ← Head: Patch-action

📝 Commits (10+)

b5ae1c2 Fix fedora
5060e9b Fix RID Linux
0be97a2 Fix package and image versions
eed4cfb Merge branch 'jellyfin:master' into Patch-action
c058af4 Fix buildling and optimize docker images
93b2a56 Removed find obj
6b2d539 Changed curl command and added gpg
34175a3 Merge branch 'jellyfin:master' into Patch-action
2fe82ff Added to Contributors
2d825d8 Removed apt-transport-https package

📊 Changes

45 files changed (+401 additions, -326 deletions)

View changed files

📝 CONTRIBUTORS.md (+2 -1)
📝 Dockerfile (+30 -36)
📝 Dockerfile.arm (+24 -32)
📝 Dockerfile.arm64 (+26 -28)
📝 bump_version (+2 -2)
📝 debian/rules (+6 -6)
📝 deployment/Dockerfile.centos.amd64 (+18 -11)
📝 deployment/Dockerfile.debian.amd64 (+12 -5)
📝 deployment/Dockerfile.debian.arm64 (+16 -9)
📝 deployment/Dockerfile.debian.armhf (+16 -9)
📝 deployment/Dockerfile.docker.amd64 (+4 -5)
📝 deployment/Dockerfile.docker.arm64 (+4 -5)
📝 deployment/Dockerfile.docker.armhf (+4 -5)
📝 deployment/Dockerfile.fedora.amd64 (+16 -9)
📝 deployment/Dockerfile.linux.amd64 (+10 -3)
📝 deployment/Dockerfile.linux.amd64-musl (+10 -3)
📝 deployment/Dockerfile.linux.arm64 (+10 -3)
📝 deployment/Dockerfile.linux.armhf (+10 -3)
📝 deployment/Dockerfile.linux.musl-linux-arm64 (+11 -4)
📝 deployment/Dockerfile.macos.amd64 (+10 -3)

...and 25 more files

📄 Description

Rework of Dockerfile and build script

Re-organized dockerfile for better syntax
Changed Debian from 10 (Buster) to 12 (Bookworm)
Changed Ubuntu from 18.04 (Bionic) to 22.04 (Jammy)
Changed CentOS from 7 to CentOS Stream 9
Changed Jammy Docker image to Built-in Jammy Microsoft .NET SDK image
Upgrade version of Intel drivers (23.39.27427.23)
Changed from debian to linux in debian/rules
Changed jellyfin-ffmpeg5 to 6
Changed GCC package version from 9 to 12
Changed liblttng-ust from 0 to 1
Changed libssl from 1.1 to 3
Changed from using "Yum" to "Dnf" for CentOS and Fedora
Arranged package installation
Added ENV for ${JELLYFIN_DATA_DIR} ${JELLYFIN_CACHE_DIR}
Added ENV NVIDIA_VISIBLE_DEVICES="all"
Added ARG DOTNET_VERSION=8.0
Added "dnf clean all" and "rm -rf /var/cache/dnf" to the end of CentOS and Fedora Dockerfiles
Added "apt-get clean", "apt-get autoremove", "rm -rf /var/lib/apt/lists/*" to the end of the Debian/Ubuntu Dockerfiles
Removed --disable-parallel (previous problem for this has been fixed in .NET 8, now the build is way faster)
Remove wget (only using curl now)
Removed libcloog-isl-dev from ubuntu.armhf and ubuntu.arm64 (not available anymore)

Other PR :

jellyfin-web https://github.com/jellyfin/jellyfin-web/pull/5109
jellyfin-ffmpeg https://github.com/jellyfin/jellyfin-ffmpeg/pull/329
jellyfin-media-player https://github.com/jellyfin/jellyfin-media-player/pull/546
metapackages https://github.com/jellyfin/jellyfin-metapackages/pull/39
JavascriptSubtitlesOctopus https://github.com/jellyfin/JavascriptSubtitlesOctopus/pull/51

Supercedes https://github.com/jellyfin/jellyfin/pull/9625

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/jellyfin/jellyfin/pull/10603 **Author:** [@Gauvino](https://github.com/Gauvino) **Created:** 11/18/2023 **Status:** ✅ Merged **Merged:** 1/18/2024 **Merged by:** [@crobibero](https://github.com/crobibero) **Base:** `master` ← **Head:** `Patch-action` --- ### 📝 Commits (10+) - [`b5ae1c2`](https://github.com/jellyfin/jellyfin/commit/b5ae1c2523b6acff7c7aaa15bdb4b861bf1fafb4) Fix fedora - [`5060e9b`](https://github.com/jellyfin/jellyfin/commit/5060e9bc0cdf481c015373ba0d363590aede421a) Fix RID Linux - [`0be97a2`](https://github.com/jellyfin/jellyfin/commit/0be97a2de5d24eae1cc9bd209584e643d54659e9) Fix package and image versions - [`eed4cfb`](https://github.com/jellyfin/jellyfin/commit/eed4cfb506329f2ac143beedbade928a2d366577) Merge branch 'jellyfin:master' into Patch-action - [`c058af4`](https://github.com/jellyfin/jellyfin/commit/c058af4b4424b1a5e64824baa59566098a01f4e4) Fix buildling and optimize docker images - [`93b2a56`](https://github.com/jellyfin/jellyfin/commit/93b2a5682143215423e378605152c74ba7aadd81) Removed find obj - [`6b2d539`](https://github.com/jellyfin/jellyfin/commit/6b2d539595f284dcd607491ebdb83d6436dd9b3f) Changed curl command and added gpg - [`34175a3`](https://github.com/jellyfin/jellyfin/commit/34175a3e118a968722378e5156c87f8be4220c37) Merge branch 'jellyfin:master' into Patch-action - [`2fe82ff`](https://github.com/jellyfin/jellyfin/commit/2fe82ff5faebe25aa7e9c987f077f520bf8d6037) Added to Contributors - [`2d825d8`](https://github.com/jellyfin/jellyfin/commit/2d825d8d7f4609acb5ec41b69842bb953c73fb28) Removed apt-transport-https package ### 📊 Changes **45 files changed** (+401 additions, -326 deletions) <details> <summary>View changed files</summary> 📝 `CONTRIBUTORS.md` (+2 -1) 📝 `Dockerfile` (+30 -36) 📝 `Dockerfile.arm` (+24 -32) 📝 `Dockerfile.arm64` (+26 -28) 📝 `bump_version` (+2 -2) 📝 `debian/rules` (+6 -6) 📝 `deployment/Dockerfile.centos.amd64` (+18 -11) 📝 `deployment/Dockerfile.debian.amd64` (+12 -5) 📝 `deployment/Dockerfile.debian.arm64` (+16 -9) 📝 `deployment/Dockerfile.debian.armhf` (+16 -9) 📝 `deployment/Dockerfile.docker.amd64` (+4 -5) 📝 `deployment/Dockerfile.docker.arm64` (+4 -5) 📝 `deployment/Dockerfile.docker.armhf` (+4 -5) 📝 `deployment/Dockerfile.fedora.amd64` (+16 -9) 📝 `deployment/Dockerfile.linux.amd64` (+10 -3) 📝 `deployment/Dockerfile.linux.amd64-musl` (+10 -3) 📝 `deployment/Dockerfile.linux.arm64` (+10 -3) 📝 `deployment/Dockerfile.linux.armhf` (+10 -3) 📝 `deployment/Dockerfile.linux.musl-linux-arm64` (+11 -4) 📝 `deployment/Dockerfile.macos.amd64` (+10 -3) _...and 25 more files_ </details> ### 📄 Description Rework of Dockerfile and build script - Re-organized dockerfile for better syntax - Changed Debian from 10 (Buster) to 12 (Bookworm) - Changed Ubuntu from 18.04 (Bionic) to 22.04 (Jammy) - Changed CentOS from 7 to CentOS Stream 9 - Changed Jammy Docker image to Built-in Jammy Microsoft .NET SDK image - Upgrade version of Intel drivers ([23.39.27427.23](https://github.com/intel/compute-runtime/releases/tag/23.39.27427.23)) - Changed from debian to linux in debian/rules - Changed jellyfin-ffmpeg5 to 6 - Changed GCC package version from 9 to 12 - Changed liblttng-ust from 0 to 1 - Changed libssl from 1.1 to 3 - Changed from using "Yum" to "Dnf" for CentOS and Fedora - Arranged package installation - Added ENV for ```${JELLYFIN_DATA_DIR} ${JELLYFIN_CACHE_DIR}``` - Added ```ENV NVIDIA_VISIBLE_DEVICES="all"``` - Added ```ARG DOTNET_VERSION=8.0``` - Added "dnf clean all" and "rm -rf /var/cache/dnf" to the end of CentOS and Fedora Dockerfiles - Added "apt-get clean", "apt-get autoremove", "rm -rf /var/lib/apt/lists/*" to the end of the Debian/Ubuntu Dockerfiles - Removed --disable-parallel (previous problem for this has been fixed in .NET 8, now the build is way faster) - Remove wget (only using curl now) - Removed libcloog-isl-dev from ubuntu.armhf and ubuntu.arm64 (not available anymore) Other PR : - jellyfin-web https://github.com/jellyfin/jellyfin-web/pull/5109 - jellyfin-ffmpeg https://github.com/jellyfin/jellyfin-ffmpeg/pull/329 - jellyfin-media-player https://github.com/jellyfin/jellyfin-media-player/pull/546 - metapackages https://github.com/jellyfin/jellyfin-metapackages/pull/39 - JavascriptSubtitlesOctopus https://github.com/jellyfin/JavascriptSubtitlesOctopus/pull/51 Supercedes https://github.com/jellyfin/jellyfin/pull/9625 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

backuprepo

2025-12-22 09:16:11 +01:00

closed this issue
added the
pull-request
label

backuprepo referenced this issue

2025-12-22 09:36:25 +01:00

[PR #12374] [MERGED] Fix compatibility between TranscodingThrottler and FFmpeg 7.0 #12990

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: starred/jellyfin#12374

No description provided.

Rows
Columns