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

Merge remote-tracking branch 'origin/master' into nofonts

This commit is contained in:
Joe Groocock 2019-07-23 12:23:03 +01:00
commit 31d6c4a64e
Signed by: frebib
GPG Key ID: E0B16BEACFBB6A86

View File

@ -1,12 +1,12 @@
ARG PLEX_VER=1.16.2.1321-ad17d5f9e ARG PLEX_VER=1.16.2.1321-ad17d5f9e
ARG PLEX_SHA=1a7e7f7761f977a81dd5a69a83ebc9ebe6f77901 ARG PLEX_SHA=1a7e7f7761f977a81dd5a69a83ebc9ebe6f77901
ARG LIBGCC1_VER=6.3.0-18+deb9u1 ARG LIBGCC1_VER=8.3.0-6
ARG XMLSTAR_VER=1.6.1 ARG XMLSTAR_VER=1.6.1
ARG CURL_VER=curl-7_65_1 ARG CURL_VER=curl-7_65_1
ARG ZLIB_VER=1.2.11 ARG ZLIB_VER=1.2.11
ARG LIBRE_VER=2.9.2 ARG LIBRE_VER=2.9.2
FROM spritsail/debian-builder:stretch-slim as builder FROM spritsail/debian-builder:buster-slim as builder
ARG PLEX_VER ARG PLEX_VER
ARG PLEX_SHA ARG PLEX_SHA
@ -18,8 +18,6 @@ ARG LIBRE_VER
ARG CURL_VER ARG CURL_VER
ARG ZLIB_VER ARG ZLIB_VER
ARG MAKEFLAGS=-j2
# Download and build zlib # Download and build zlib
WORKDIR /tmp/zlib WORKDIR /tmp/zlib
RUN curl -sSf https://www.zlib.net/zlib-$ZLIB_VER.tar.xz \ RUN curl -sSf https://www.zlib.net/zlib-$ZLIB_VER.tar.xz \
@ -150,6 +148,7 @@ RUN curl -fsSL http://ftp.de.debian.org/debian/pool/main/g/gcc-${LIBGCC1_VER:0:1
RUN find -exec sh -c 'file "{}" | grep -q ELF && strip --strip-debug "{}"' \; \ RUN find -exec sh -c 'file "{}" | grep -q ELF && strip --strip-debug "{}"' \; \
# Disable executable stack in all libraries. This should already be the case # Disable executable stack in all libraries. This should already be the case
# but it seems libgnsdk is not playing along # but it seems libgnsdk is not playing along
&& apt-get -y update \
&& apt-get -y install execstack \ && apt-get -y install execstack \
&& execstack -c usr/lib/*.so* \ && execstack -c usr/lib/*.so* \
\ \