From 2e8a79511e94e9304862a4d20cbc46246fde87b7 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Wed, 28 Aug 2019 20:41:16 +0100 Subject: [PATCH 01/13] Update to Plex 1.16.5.1554 --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index bc357c3..db0c12b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -ARG PLEX_VER=1.16.5.1488-deeb86e7f -ARG PLEX_SHA=e46c4db05ef9402447246e92e3f5ed808eb11389 +ARG PLEX_VER=1.16.5.1554-1e5ff713d +ARG PLEX_SHA=0e971b02cadbeb35ff6a1a5dcbb26a01d9093ddd ARG XMLSTAR_VER=1.6.1 -ARG CURL_VER=curl-7_65_1 +ARG CURL_VER=curl-7_65_3 ARG ZLIB_VER=1.2.11 ARG LIBRE_VER=2.9.2 From 806c82f49a74bd995043dc08c0843edc7a4d895f Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Tue, 1 Oct 2019 20:03:23 +0100 Subject: [PATCH 02/13] Update to Plex 1.17.0.1841 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index db0c12b..42ce7eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG PLEX_VER=1.16.5.1554-1e5ff713d -ARG PLEX_SHA=0e971b02cadbeb35ff6a1a5dcbb26a01d9093ddd +ARG PLEX_VER=1.17.0.1841-d42cfa161 +ARG PLEX_SHA=dcfb6bc5964d460e23876a5bea1de3c803503672 ARG XMLSTAR_VER=1.6.1 ARG CURL_VER=curl-7_65_3 ARG ZLIB_VER=1.2.11 From da88643298749e1f429568d43c4c76e1e51f40bd Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Thu, 3 Oct 2019 11:09:17 +0100 Subject: [PATCH 03/13] Update to Plex 1.18.0.1846 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 42ce7eb..44822c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG PLEX_VER=1.17.0.1841-d42cfa161 -ARG PLEX_SHA=dcfb6bc5964d460e23876a5bea1de3c803503672 +ARG PLEX_VER=1.18.0.1846-f62172e99 +ARG PLEX_SHA=d8d4726a62eb71e9501674fbcce29340c716d514 ARG XMLSTAR_VER=1.6.1 ARG CURL_VER=curl-7_65_3 ARG ZLIB_VER=1.2.11 From 7c7d1f34c0b7d1b54d46ff8eff0843968c6170b6 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Sun, 13 Oct 2019 12:23:12 +0100 Subject: [PATCH 04/13] Update to Plex 1.18.0.1913 --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 44822c4..bb8db74 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -ARG PLEX_VER=1.18.0.1846-f62172e99 -ARG PLEX_SHA=d8d4726a62eb71e9501674fbcce29340c716d514 +ARG PLEX_VER=1.18.0.1913-e5cc93306 +ARG PLEX_SHA=f428c27b26a54f334d1a8aa2e86fc3bc36bd5d7d ARG XMLSTAR_VER=1.6.1 -ARG CURL_VER=curl-7_65_3 +ARG CURL_VER=curl-7_66_0 ARG ZLIB_VER=1.2.11 ARG LIBRE_VER=2.9.2 From eca6a243b0ceb44589b7da708081963d751f7984 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Wed, 16 Oct 2019 20:46:00 +0100 Subject: [PATCH 05/13] Update to Plex 1.18.0.1944 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index bb8db74..ab995e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG PLEX_VER=1.18.0.1913-e5cc93306 -ARG PLEX_SHA=f428c27b26a54f334d1a8aa2e86fc3bc36bd5d7d +ARG PLEX_VER=1.18.0.1944-f2cae8d6b +ARG PLEX_SHA=96f06eda26404d2f56a5628f543ad218de9c30d1 ARG XMLSTAR_VER=1.6.1 ARG CURL_VER=curl-7_66_0 ARG ZLIB_VER=1.2.11 From 308f51ce48b0a3ff3678a45f63b6266e8cd7989f Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Tue, 29 Oct 2019 11:21:31 +0000 Subject: [PATCH 06/13] Update to Plex 1.18.1.1973 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ab995e1..6d639ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG PLEX_VER=1.18.0.1944-f2cae8d6b -ARG PLEX_SHA=96f06eda26404d2f56a5628f543ad218de9c30d1 +ARG PLEX_VER=1.18.1.1973-0f4abfbcc +ARG PLEX_SHA=b7486cf23d2ad4dbf547e5b80f008ea4eb62bed1 ARG XMLSTAR_VER=1.6.1 ARG CURL_VER=curl-7_66_0 ARG ZLIB_VER=1.2.11 From 92f41677b230411fddc0fbbbd6c1345efb197963 Mon Sep 17 00:00:00 2001 From: TBK Date: Mon, 18 Nov 2019 09:20:31 +0100 Subject: [PATCH 07/13] Update to Plex 1.18.2.2029 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6d639ba..189c83b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG PLEX_VER=1.18.1.1973-0f4abfbcc -ARG PLEX_SHA=b7486cf23d2ad4dbf547e5b80f008ea4eb62bed1 +ARG PLEX_VER=1.18.2.2029-36236cc4c +ARG PLEX_SHA=4e1d7ed3c5f73af03b5ed354d821a26a3d89c61e ARG XMLSTAR_VER=1.6.1 ARG CURL_VER=curl-7_66_0 ARG ZLIB_VER=1.2.11 From 6946ea7d143a7f99f3950f9e515638e5a9188524 Mon Sep 17 00:00:00 2001 From: Adam Dodman Date: Thu, 21 Nov 2019 16:05:50 +0000 Subject: [PATCH 08/13] Update to Plex ver 1.18.2.2041-3d469cb3 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 189c83b..169e952 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG PLEX_VER=1.18.2.2029-36236cc4c -ARG PLEX_SHA=4e1d7ed3c5f73af03b5ed354d821a26a3d89c61e +ARG PLEX_VER=1.18.2.2041-3d469cb32 +ARG PLEX_SHA=a8333bbb5b2a0c859a0f4d3852462f049dc2cd7f ARG XMLSTAR_VER=1.6.1 ARG CURL_VER=curl-7_66_0 ARG ZLIB_VER=1.2.11 From 904345ed1091666e544442ce8b084e44a751b62d Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Sat, 23 Nov 2019 11:06:43 +0000 Subject: [PATCH 09/13] Update to Plex 1.18.2.2058 --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 169e952..818252b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -ARG PLEX_VER=1.18.2.2041-3d469cb32 -ARG PLEX_SHA=a8333bbb5b2a0c859a0f4d3852462f049dc2cd7f +ARG PLEX_VER=1.18.2.2058-e67a4e892 +ARG PLEX_SHA=a8514d40e7ec37f06ec7f2e7a9016b5cead6e7e6 ARG XMLSTAR_VER=1.6.1 -ARG CURL_VER=curl-7_66_0 +ARG CURL_VER=curl-7_67_0 ARG ZLIB_VER=1.2.11 ARG LIBRE_VER=2.9.2 From 86e5c6efc9acee5758796fab4dafc9d4612424cd Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Wed, 27 Nov 2019 22:24:19 +0000 Subject: [PATCH 10/13] Revert curl 7.67.0 as it seems to be broken --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 818252b..1e904c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG PLEX_VER=1.18.2.2058-e67a4e892 ARG PLEX_SHA=a8514d40e7ec37f06ec7f2e7a9016b5cead6e7e6 ARG XMLSTAR_VER=1.6.1 -ARG CURL_VER=curl-7_67_0 +ARG CURL_VER=curl-7_66_0 ARG ZLIB_VER=1.2.11 ARG LIBRE_VER=2.9.2 From bf9a0d52d77456832aee402a790a9d495c3415a6 Mon Sep 17 00:00:00 2001 From: TBK Date: Tue, 17 Dec 2019 23:13:02 +0100 Subject: [PATCH 11/13] Update to Plex 1.18.3.2156 https://forums.plex.tv/t/plex-media-server/30447/307 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1e904c0..85dada7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG PLEX_VER=1.18.2.2058-e67a4e892 -ARG PLEX_SHA=a8514d40e7ec37f06ec7f2e7a9016b5cead6e7e6 +ARG PLEX_VER=1.18.3.2156-349e9837e +ARG PLEX_SHA=91728eb5e713e88dddd1eda06f6abfb88da73d03 ARG XMLSTAR_VER=1.6.1 ARG CURL_VER=curl-7_66_0 ARG ZLIB_VER=1.2.11 From 10faecbeec3d20418ba309e874d6ff9a07e68be0 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Wed, 8 Jan 2020 17:20:19 +0000 Subject: [PATCH 12/13] Replace LibreSSL with OpenSSL to fix TheTVDB agent --- Dockerfile | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 85dada7..36fea0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG PLEX_SHA=91728eb5e713e88dddd1eda06f6abfb88da73d03 ARG XMLSTAR_VER=1.6.1 ARG CURL_VER=curl-7_66_0 ARG ZLIB_VER=1.2.11 -ARG LIBRE_VER=2.9.2 +ARG OPENSSL_VER=1.0.2u FROM spritsail/debian-builder:buster-slim as builder @@ -12,7 +12,7 @@ ARG PLEX_SHA ARG LIBXML2_VER=v2.9.9 ARG LIBXSLT_VER=v1.1.33 ARG XMLSTAR_VER -ARG LIBRE_VER +ARG OPENSSL_VER ARG CURL_VER ARG ZLIB_VER @@ -93,13 +93,21 @@ RUN git clone git://git.code.sf.net/p/xmlstar/code --branch $XMLSTAR_VER --depth --with-libxslt-prefix=$PREFIX/usr \ && make DESTDIR=$PREFIX install -# Download and build LibreSSL as a cURL dependency -WORKDIR /tmp/libressl -RUN curl -sSL https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${LIBRE_VER}.tar.gz \ +# Download and build OpenSSL as a cURL dependency +WORKDIR /tmp/openssl +RUN curl -sSL https://openssl.org/source/openssl-${OPENSSL_VER}.tar.gz \ | tar xz --strip-components=1 \ # Install to the default system directories so cURL can find it - && ./configure --prefix=/usr \ - && make install + && ./config \ + --prefix=/usr \ + --libdir=lib \ + --with-zlib-lib=$PREFIX/usr/lib/ \ + --with-zlib-include=$PREFIX/usr/include \ + shared \ + zlib-dynamic \ + no-rc5 \ + && make install \ + && cp libssl*.so* libcrypto*.so* $PREFIX/usr/lib # Download and build curl WORKDIR /tmp/curl @@ -164,10 +172,11 @@ RUN chmod +x /output/usr/local/bin/* #========================= -FROM spritsail/libressl:$LIBRE_VER +FROM spritsail/busybox:latest ARG PLEX_VER ARG CURL_VER +ARG OPENSSL_VER ARG XMLSTAR_VER LABEL maintainer="Spritsail " \ @@ -178,6 +187,7 @@ LABEL maintainer="Spritsail " \ org.label-schema.version=${PLEX_VER} \ io.spritsail.version.plex=${PLEX_VER} \ io.spritsail.version.curl=${CURL_VER} \ + io.spritsail.version.openssl=${OPENSSL_VER} \ io.spritsail.version.xmlstarlet=${XMLSTAR_VER} WORKDIR /usr/lib/plexmediaserver From 844f1f7cc37be81951c9c816822c1ba6dc9a2d4f Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Wed, 8 Jan 2020 19:17:14 +0000 Subject: [PATCH 13/13] Update to Plex ver 1.18.4.2171 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 36fea0e..9f5a78e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG PLEX_VER=1.18.3.2156-349e9837e -ARG PLEX_SHA=91728eb5e713e88dddd1eda06f6abfb88da73d03 +ARG PLEX_VER=1.18.4.2171-ac2afe5f8 +ARG PLEX_SHA=1ca3e97d72c7a2c9f1b7babb3adbc533380a28df ARG XMLSTAR_VER=1.6.1 ARG CURL_VER=curl-7_66_0 ARG ZLIB_VER=1.2.11