From c382bca5c6f82cd5bcf5870ff2572c9dad2bf781 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Mon, 3 Feb 2020 22:14:54 +0000 Subject: [PATCH 01/11] Update to Plex ver 1.18.5.2309 --- .drone.yml | 21 +++------------------ Dockerfile | 7 ++++--- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2fdab7a..7ca2175 100644 --- a/.drone.yml +++ b/.drone.yml @@ -44,30 +44,15 @@ steps: tags: - latest - "%label io.spritsail.version.plex | %remsuf [0-9a-f]+$ | %auto 2" - environment: - DOCKER_PASSWORD: - from_secret: docker_password - DOCKER_USERNAME: + username: from_secret: docker_username + password: + from_secret: docker_password when: branch: - master event: - push - - tag - -- name: notify - pull: always - image: spritsail/notify - environment: - NOTIFY_TOKEN: - from_secret: notify_token - WEBHOOK_URL: - from_secret: webhook_url - when: - status: - - success - - failure --- kind: signature diff --git a/Dockerfile b/Dockerfile index 9f5a78e..fdbbf3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG PLEX_VER=1.18.4.2171-ac2afe5f8 -ARG PLEX_SHA=1ca3e97d72c7a2c9f1b7babb3adbc533380a28df +ARG PLEX_VER=1.18.5.2309-f5213a238 +ARG PLEX_SHA=83b6084f2aab5e74340296e529dabc39b6a93e54 ARG XMLSTAR_VER=1.6.1 ARG CURL_VER=curl-7_66_0 ARG ZLIB_VER=1.2.11 @@ -26,7 +26,7 @@ RUN curl -fsSL -o plexmediaserver.deb https://downloads.plex.tv/plex-media-serve && dpkg-deb -x plexmediaserver.deb . \ \ && rm -r \ - etc/ lib/ usr/sbin/ usr/share/ \ + etc/ usr/sbin/ usr/share/ \ plexmediaserver.deb \ \ && cd usr/lib/plexmediaserver \ @@ -37,6 +37,7 @@ RUN curl -fsSL -o plexmediaserver.deb https://downloads.plex.tv/plex-media-serve lib/libxml2.so* \ lib/libxslt.so* \ lib/libexslt.so* \ + lib/plexmediaserver.* \ Resources/start.sh \ # Place shared libraries in usr/lib so they can be actually shared && mv lib/*.so* lib/dri ../ \ From 7b3d3655f279d2978009c4997dc449fae1fd7432 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Fri, 14 Feb 2020 12:50:24 +0000 Subject: [PATCH 02/11] Update to Plex 1.18.6.2368 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fdbbf3a..200c942 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG PLEX_VER=1.18.5.2309-f5213a238 -ARG PLEX_SHA=83b6084f2aab5e74340296e529dabc39b6a93e54 +ARG PLEX_VER=1.18.6.2368-97add474d +ARG PLEX_SHA=fec3e8866cca3513971a384d4aad96d49cdf523b ARG XMLSTAR_VER=1.6.1 ARG CURL_VER=curl-7_66_0 ARG ZLIB_VER=1.2.11 From 7acdea71990e97a2a1e87ae9c549f4d78b781fd2 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Mon, 24 Feb 2020 17:57:29 +0000 Subject: [PATCH 03/11] Update to Plex ver 1.18.7.2457 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 200c942..1e7d69a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG PLEX_VER=1.18.6.2368-97add474d -ARG PLEX_SHA=fec3e8866cca3513971a384d4aad96d49cdf523b +ARG PLEX_VER=1.18.7.2457-77cb9455c +ARG PLEX_SHA=eff3c8ca891653b1b80ad3df2c268dc6605c78e1 ARG XMLSTAR_VER=1.6.1 ARG CURL_VER=curl-7_66_0 ARG ZLIB_VER=1.2.11 From a663d51664624167ea22821b2ecf27f658b7a86d Mon Sep 17 00:00:00 2001 From: TBK Date: Fri, 13 Mar 2020 16:30:57 +0100 Subject: [PATCH 04/11] Update to Plex 1.18.8.2527 https://forums.plex.tv/t/plex-media-server/30447/324 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1e7d69a..211b5db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG PLEX_VER=1.18.7.2457-77cb9455c -ARG PLEX_SHA=eff3c8ca891653b1b80ad3df2c268dc6605c78e1 +ARG PLEX_VER=1.18.8.2527-740d4c206 +ARG PLEX_SHA=f2099dff83da3cddfefa97e65f4c22cc90a193ac ARG XMLSTAR_VER=1.6.1 ARG CURL_VER=curl-7_66_0 ARG ZLIB_VER=1.2.11 From a3661af9f6d3c9974b0f400eba6e0e4047fc2c5e Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Thu, 26 Mar 2020 19:57:08 +0000 Subject: [PATCH 05/11] Update to Plex ver 1.18.9.2571 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 211b5db..994a964 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG PLEX_VER=1.18.8.2527-740d4c206 -ARG PLEX_SHA=f2099dff83da3cddfefa97e65f4c22cc90a193ac +ARG PLEX_VER=1.18.9.2571-e106a8a91 +ARG PLEX_SHA=7bc22e03a74d992783645779b49f39443f7a3d4c ARG XMLSTAR_VER=1.6.1 ARG CURL_VER=curl-7_66_0 ARG ZLIB_VER=1.2.11 From 331c83d1142c5aa617e26832ae5e40aa1fb6ab3f Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Mon, 30 Mar 2020 21:49:40 +0100 Subject: [PATCH 06/11] Update to Plex ver 1.18.9.2578 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 994a964..ead69a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG PLEX_VER=1.18.9.2571-e106a8a91 -ARG PLEX_SHA=7bc22e03a74d992783645779b49f39443f7a3d4c +ARG PLEX_VER=1.18.9.2578-513b381af +ARG PLEX_SHA=8854a6aebe9ac375431b2e3e5addc7b7421dea4a ARG XMLSTAR_VER=1.6.1 ARG CURL_VER=curl-7_66_0 ARG ZLIB_VER=1.2.11 From 628ea0618b5ccef6614ac519030dc5d43bd4c4ed Mon Sep 17 00:00:00 2001 From: TBK Date: Sat, 11 Apr 2020 00:37:34 +0200 Subject: [PATCH 07/11] Update to Plex ver 1.19.1.2645 https://forums.plex.tv/t/plex-media-server/30447/332 --- Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index ead69a5..4251a68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,16 @@ -ARG PLEX_VER=1.18.9.2578-513b381af -ARG PLEX_SHA=8854a6aebe9ac375431b2e3e5addc7b7421dea4a +ARG PLEX_VER=1.19.1.2645-ccb6eb67e +ARG PLEX_SHA=8fe22d8353293816cd3549c46ec0bc8314c0facd ARG XMLSTAR_VER=1.6.1 -ARG CURL_VER=curl-7_66_0 +ARG CURL_VER=curl-7_69_1 ARG ZLIB_VER=1.2.11 -ARG OPENSSL_VER=1.0.2u +ARG OPENSSL_VER=1.1.1f FROM spritsail/debian-builder:buster-slim as builder ARG PLEX_VER ARG PLEX_SHA -ARG LIBXML2_VER=v2.9.9 -ARG LIBXSLT_VER=v1.1.33 +ARG LIBXML2_VER=v2.9.10 +ARG LIBXSLT_VER=v1.1.34 ARG XMLSTAR_VER ARG OPENSSL_VER ARG CURL_VER @@ -26,7 +26,7 @@ RUN curl -fsSL -o plexmediaserver.deb https://downloads.plex.tv/plex-media-serve && dpkg-deb -x plexmediaserver.deb . \ \ && rm -r \ - etc/ usr/sbin/ usr/share/ \ + etc/ usr/share/ \ plexmediaserver.deb \ \ && cd usr/lib/plexmediaserver \ From 2ea565da34ff9d651ed68e9d4f7d87c8a1e4c6a3 Mon Sep 17 00:00:00 2001 From: TBK Date: Fri, 24 Apr 2020 14:53:53 +0200 Subject: [PATCH 08/11] Update to Plex ver 1.19.1.2701 https://forums.plex.tv/t/plex-media-server/30447/334 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4251a68..3b49b83 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG PLEX_VER=1.19.1.2645-ccb6eb67e -ARG PLEX_SHA=8fe22d8353293816cd3549c46ec0bc8314c0facd +ARG PLEX_VER=1.19.1.2701-6327e27bf +ARG PLEX_SHA=1b7680dc897a25ba064e272e0cc8ce39f4c2e40e ARG XMLSTAR_VER=1.6.1 ARG CURL_VER=curl-7_69_1 ARG ZLIB_VER=1.2.11 From ee174b38723b2bc55881f01f6fe9add9e2d5a14b Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Fri, 1 May 2020 10:56:33 +0100 Subject: [PATCH 09/11] Update to Plex 1.19.2.2737 --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3b49b83..73b3acc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -ARG PLEX_VER=1.19.1.2701-6327e27bf -ARG PLEX_SHA=1b7680dc897a25ba064e272e0cc8ce39f4c2e40e +ARG PLEX_VER=1.19.2.2737-b69929dab +ARG PLEX_SHA=817ef52c1f84d8ba63fe4d692225a4dfb06e1aa0 ARG XMLSTAR_VER=1.6.1 -ARG CURL_VER=curl-7_69_1 +ARG CURL_VER=curl-7_70_0 ARG ZLIB_VER=1.2.11 -ARG OPENSSL_VER=1.1.1f +ARG OPENSSL_VER=1.1.1g FROM spritsail/debian-builder:buster-slim as builder From 8762491a4fb30e58a59b3573b9a0b2c9525334e3 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Tue, 12 May 2020 09:45:04 +0100 Subject: [PATCH 10/11] Update to Plex 1.19.3.2764 Signed-off-by: Joe Groocock --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 73b3acc..47ec312 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG PLEX_VER=1.19.2.2737-b69929dab -ARG PLEX_SHA=817ef52c1f84d8ba63fe4d692225a4dfb06e1aa0 +ARG PLEX_VER=1.19.3.2764-ef515a800 +ARG PLEX_SHA=17de3f6444f571d7c441b04b0ff90799ee8784c4 ARG XMLSTAR_VER=1.6.1 ARG CURL_VER=curl-7_70_0 ARG ZLIB_VER=1.2.11 From fbc903e920f0c4ce384ed333f1d3035e44957e8f Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Tue, 12 May 2020 09:49:18 +0100 Subject: [PATCH 11/11] Fix missing curl/libssl ca-certificates Before: root@b054d9b406bf /u/l/plexmediaserver> curl https://spritsail.io -I curl: (77) error setting certificate verify locations: CAfile: /etc/ssl/certs/ca-certificates.crt CApath: none After: root@7571fd092ba1 /u/l/plexmediaserver> curl https://spritsail.io -I HTTP/1.1 200 OK Server: nginx/1.17.10 Date: Tue, 12 May 2020 09:38:09 GMT Content-Type: text/html Content-Length: 8158 Last-Modified: Fri, 01 Feb 2019 20:18:29 GMT Connection: keep-alive ETag: 5c54a995-1fde Strict-Transport-Security: max-age=63072000; includeSubDomains; preload X-Content-Type-Options: nosniff X-Frame-Options: DENY Accept-Ranges: bytes Signed-off-by: Joe Groocock --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 47ec312..a1cc404 100644 --- a/Dockerfile +++ b/Dockerfile @@ -152,7 +152,9 @@ RUN git clone https://github.com/curl/curl.git --branch $CURL_VER --depth 1 . \ WORKDIR $PREFIX -RUN mkdir -p /output/usr/lib /output/usr/bin \ +RUN mkdir -p /output/usr/lib /output/usr/bin /output/etc/ssl/certs \ + # Link Plex ca-certificates as system store so curl and others can use them too + && ln -sv /usr/lib/plexmediaserver/Resources/cacert.pem /output/etc/ssl/certs/ca-certificates.crt \ && mv usr/lib/*.so* \ /plex/usr/lib/* \ /output/usr/lib \