2
0
mirror of https://github.com/spritsail/plex-media-server.git synced 2024-12-20 11:34:36 +00:00

Merge branch 'master' into pass

Signed-off-by: Joe Groocock <me@frebib.net>
This commit is contained in:
Joe Groocock 2020-05-12 10:42:12 +01:00
commit d01ee10d24
Signed by: frebib
GPG Key ID: E0B16BEACFBB6A86

View File

@ -152,7 +152,9 @@ RUN git clone https://github.com/curl/curl.git --branch $CURL_VER --depth 1 . \
WORKDIR $PREFIX 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* \ && mv usr/lib/*.so* \
/plex/usr/lib/* \ /plex/usr/lib/* \
/output/usr/lib \ /output/usr/lib \