mirror of
				https://github.com/linuxserver/docker-jellyfin.git
				synced 2025-10-31 21:17:39 +09:00 
			
		
		
		
	switch to ffmpeg6, clean up repo and packages
This commit is contained in:
		
							
								
								
									
										12
									
								
								Dockerfile
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								Dockerfile
									
									
									
									
									
								
							| @@ -15,9 +15,9 @@ ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility" | ||||
|  | ||||
| RUN \ | ||||
|   echo "**** install jellyfin *****" && \ | ||||
|   curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | apt-key add - && \ | ||||
|   echo 'deb [arch=amd64] https://repo.jellyfin.org/ubuntu jammy main' > /etc/apt/sources.list.d/jellyfin.list && \ | ||||
|   echo 'deb [arch=amd64] https://repo.jellyfin.org/ubuntu jammy unstable' >> /etc/apt/sources.list.d/jellyfin.list && \ | ||||
|   curl -fSsL https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | gpg --dearmor | tee /usr/share/keyrings/jellyfin.gpg >/dev/null && \ | ||||
|   echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/jellyfin.gpg] https://repo.jellyfin.org/ubuntu jammy main' > /etc/apt/sources.list.d/jellyfin.list && \ | ||||
|   echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/jellyfin.gpg] https://repo.jellyfin.org/ubuntu jammy unstable' >> /etc/apt/sources.list.d/jellyfin.list && \ | ||||
|   if [ -z ${JELLYFIN_RELEASE+x} ]; then \ | ||||
|     JELLYFIN_RELEASE=$(curl -sX GET https://repo.jellyfin.org/ubuntu/dists/jammy/unstable/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin-server' | awk -F ': ' '/Version/{print $2;exit}'); \ | ||||
|   fi && \ | ||||
| @@ -25,11 +25,7 @@ RUN \ | ||||
|   apt-get install -y --no-install-recommends \ | ||||
|     at \ | ||||
|     jellyfin-server=${JELLYFIN_RELEASE} \ | ||||
|     jellyfin-ffmpeg5 \ | ||||
|     jellyfin-web \ | ||||
|     libfontconfig1 \ | ||||
|     libfreetype6 \ | ||||
|     libssl3 \ | ||||
|     jellyfin-ffmpeg6 \ | ||||
|     mesa-va-drivers && \ | ||||
|   echo "**** cleanup ****" && \ | ||||
|   rm -rf \ | ||||
|   | ||||
| @@ -15,9 +15,9 @@ ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility" | ||||
|  | ||||
| RUN \ | ||||
|   echo "**** install jellyfin *****" && \ | ||||
|   curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | apt-key add - && \ | ||||
|   echo 'deb [arch=arm64] https://repo.jellyfin.org/ubuntu jammy main' > /etc/apt/sources.list.d/jellyfin.list && \ | ||||
|   echo 'deb [arch=arm64] https://repo.jellyfin.org/ubuntu jammy unstable' >> /etc/apt/sources.list.d/jellyfin.list && \ | ||||
|   curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | gpg --dearmor | tee /usr/share/keyrings/jellyfin.gpg >/dev/null && \ | ||||
|   echo 'deb [arch=arm64 signed-by=/usr/share/keyrings/jellyfin.gpg] https://repo.jellyfin.org/ubuntu jammy main' > /etc/apt/sources.list.d/jellyfin.list && \ | ||||
|   echo 'deb [arch=arm64 signed-by=/usr/share/keyrings/jellyfin.gpg] https://repo.jellyfin.org/ubuntu jammy unstable' >> /etc/apt/sources.list.d/jellyfin.list && \ | ||||
|   if [ -z ${JELLYFIN_RELEASE+x} ]; then \ | ||||
|     JELLYFIN_RELEASE=$(curl -sX GET https://repo.jellyfin.org/ubuntu/dists/jammy/unstable/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin-server' | awk -F ': ' '/Version/{print $2;exit}'); \ | ||||
|   fi && \ | ||||
| @@ -25,14 +25,10 @@ RUN \ | ||||
|   apt-get install -y --no-install-recommends \ | ||||
|     at \ | ||||
|     jellyfin-server=${JELLYFIN_RELEASE} \ | ||||
|     jellyfin-ffmpeg5 \ | ||||
|     jellyfin-web \ | ||||
|     libfontconfig1 \ | ||||
|     libfreetype6 \ | ||||
|     jellyfin-ffmpeg6 \ | ||||
|     libomxil-bellagio0 \ | ||||
|     libomxil-bellagio-bin \ | ||||
|     libraspberrypi0 \ | ||||
|     libssl3 && \ | ||||
|     libraspberrypi0 && \ | ||||
|   echo "**** cleanup ****" && \ | ||||
|   rm -rf \ | ||||
|     /tmp/* \ | ||||
|   | ||||
| @@ -90,6 +90,7 @@ app_setup_block: | | ||||
|   ``` | ||||
| # changelog | ||||
| changelogs: | ||||
|   - {date: "03.12.23:", desc: "Switch nightly to ffmpeg6."} | ||||
|   - {date: "01.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} | ||||
|   - {date: "07.12.22:", desc: "Rebase nightly to Jammy, migrate to s6v3."} | ||||
|   - {date: "05.01.22:", desc: "Specify Intel iHD driver versions to avoid mismatched libva errors."} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user