From 5945a638ff37443dada93eeef6d35aa31d7c9734 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Mon, 26 Aug 2019 11:00:36 -0400 Subject: [PATCH] Update builds to Debian 10 and OpenSSL to 1.1-only --- deployment/debian-package-arm64/Dockerfile.amd64 | 2 +- deployment/debian-package-arm64/Dockerfile.arm64 | 2 +- deployment/debian-package-armhf/Dockerfile.amd64 | 2 +- deployment/debian-package-armhf/Dockerfile.armhf | 2 +- deployment/debian-package-x64/Dockerfile | 2 +- deployment/debian-package-x64/pkg-src/control | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deployment/debian-package-arm64/Dockerfile.amd64 b/deployment/debian-package-arm64/Dockerfile.amd64 index 2cb8bd856e..5cfd8854ea 100644 --- a/deployment/debian-package-arm64/Dockerfile.amd64 +++ b/deployment/debian-package-arm64/Dockerfile.amd64 @@ -1,4 +1,4 @@ -FROM debian:9 +FROM debian:10 # Docker build arguments ARG SOURCE_DIR=/jellyfin ARG PLATFORM_DIR=/jellyfin/deployment/debian-package-arm64 diff --git a/deployment/debian-package-arm64/Dockerfile.arm64 b/deployment/debian-package-arm64/Dockerfile.arm64 index bb9e28d0aa..4f2903a237 100644 --- a/deployment/debian-package-arm64/Dockerfile.arm64 +++ b/deployment/debian-package-arm64/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM debian:9 +FROM debian:10 # Docker build arguments ARG SOURCE_DIR=/jellyfin ARG PLATFORM_DIR=/jellyfin/deployment/debian-package-arm64 diff --git a/deployment/debian-package-armhf/Dockerfile.amd64 b/deployment/debian-package-armhf/Dockerfile.amd64 index 0d62352e0b..1001bf1081 100644 --- a/deployment/debian-package-armhf/Dockerfile.amd64 +++ b/deployment/debian-package-armhf/Dockerfile.amd64 @@ -1,4 +1,4 @@ -FROM debian:9 +FROM debian:10 # Docker build arguments ARG SOURCE_DIR=/jellyfin ARG PLATFORM_DIR=/jellyfin/deployment/debian-package-armhf diff --git a/deployment/debian-package-armhf/Dockerfile.armhf b/deployment/debian-package-armhf/Dockerfile.armhf index eb4152116f..1ae37a2b09 100644 --- a/deployment/debian-package-armhf/Dockerfile.armhf +++ b/deployment/debian-package-armhf/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM debian:9 +FROM debian:10 # Docker build arguments ARG SOURCE_DIR=/jellyfin ARG PLATFORM_DIR=/jellyfin/deployment/debian-package-armhf diff --git a/deployment/debian-package-x64/Dockerfile b/deployment/debian-package-x64/Dockerfile index 9819cc20db..c2ecd29d3d 100644 --- a/deployment/debian-package-x64/Dockerfile +++ b/deployment/debian-package-x64/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:2.2-sdk-stretch +FROM microsoft/dotnet:2.2-sdk-buster # Docker build arguments ARG SOURCE_DIR=/jellyfin ARG PLATFORM_DIR=/jellyfin/deployment/debian-package-x64 diff --git a/deployment/debian-package-x64/pkg-src/control b/deployment/debian-package-x64/pkg-src/control index 4422f0fda4..535dfb21fe 100644 --- a/deployment/debian-package-x64/pkg-src/control +++ b/deployment/debian-package-x64/pkg-src/control @@ -23,6 +23,6 @@ Depends: at, jellyfin-ffmpeg, libfontconfig1, libfreetype6, - libssl1.0.0 | libssl1.0.2 | libssl1.1 + libssl1.1 Description: Jellyfin is a home media server. It is built on top of other popular open source technologies such as Service Stack, jQuery, jQuery mobile, and Mono. It features a REST-based api with built-in documentation to facilitate client development. We also have client libraries for our api to enable rapid development.