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 nofonts

This commit is contained in:
Joe Groocock 2018-08-20 20:41:27 +01:00
commit c4a2e77d73
Signed by: frebib
GPG Key ID: E0B16BEACFBB6A86

View File

@ -127,6 +127,7 @@ RUN curl -fsSL http://ftp.de.debian.org/debian/pool/main/g/gcc-${LIBSTDCPP_VER:0
&& cd usr/lib/plexmediaserver \
&& rm -f \
"Plex Media Server Tests" \
MigratePlexServerConfig.sh \
libcrypto.so.1.0.0 \
libcurl.so.4 \
libssl.so.1.0.0 \
@ -136,6 +137,7 @@ RUN curl -fsSL http://ftp.de.debian.org/debian/pool/main/g/gcc-${LIBSTDCPP_VER:0
Resources/Fonts/NotoNaskh* \
Resources/Fonts/NotoSans* \
Resources/Fonts/OpenSans* \
Resources/start.sh \
# Place shared libraries in usr/lib so they can be actually shared
&& mv *.so* ../