tidy up Dockerfile and use only one install run for runtime packages

This commit is contained in:
sparklyballs
2017-07-03 11:34:18 +01:00
parent 0e8ea6063c
commit e4e07121af

View File

@@ -11,7 +11,7 @@ ARG BUILD_DATE
ARG VERSION
LABEL build_version="Build-date:- ${BUILD_DATE}"
# environment settings
# Environment settings
ENV HOME="/config"
# copy patches
@@ -23,7 +23,6 @@ RUN \
autoconf \
automake \
cmake \
coreutils \
ffmpeg-dev \
file \
findutils \
@@ -31,14 +30,14 @@ RUN \
gcc \
gettext-dev \
git \
libhdhomerun-dev \
libgcrypt-dev \
libhdhomerun-dev \
libressl-dev \
libtool \
libxml2-dev \
libxslt-dev \
make \
mercurial \
libressl-dev \
patch \
pcre2-dev \
perl-dev \
@@ -51,16 +50,21 @@ RUN \
--repository http://nl.alpinelinux.org/alpine/edge/testing \
gnu-libiconv-dev && \
# add runtime dependencies required in build stage
# install runtime packages
apk add --no-cache \
bsd-compat-headers \
bzip2 \
curl \
ffmpeg \
ffmpeg-libs \
gzip \
libcrypto1.0 \
libcurl \
libhdhomerun-libs \
libressl \
libssl1.0 \
libxml2 \
libxslt \
linux-headers \
pcre2 \
perl \
@@ -120,6 +124,9 @@ RUN \
uriparser \
wget \
zlib && \
apk add --no-cache \
--repository http://nl.alpinelinux.org/alpine/edge/testing \
gnu-libiconv && \
# install perl modules for xmltv
curl -L http://cpanmin.us | perl - App::cpanminus && \
@@ -155,12 +162,14 @@ RUN \
make install && \
# build XMLTV
curl -o /tmp/xmtltv-src.tar.bz2 -L \
curl -o \
/tmp/xmtltv-src.tar.bz2 -L \
"http://kent.dl.sourceforge.net/project/xmltv/xmltv/${XMLTV_VER}/xmltv-${XMLTV_VER}.tar.bz2" && \
tar xf /tmp/xmtltv-src.tar.bz2 -C \
tar xf \
/tmp/xmtltv-src.tar.bz2 -C \
/tmp --strip-components=1 && \
cd "/tmp/xmltv-${XMLTV_VER}" && \
/bin/echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \
echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \
make && \
make test && \
make install && \
@@ -172,7 +181,8 @@ RUN \
curl -o \
/tmp/argtable-src.tar.gz -L \
"https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
tar xf /tmp/argtable-src.tar.gz -C \
tar xf \
/tmp/argtable-src.tar.gz -C \
/tmp/argtable --strip-components=1 && \
cd /tmp/argtable && \
./configure \
@@ -191,17 +201,6 @@ RUN \
make && \
make install && \
# install runtime packages
apk add --no-cache \
ffmpeg \
ffmpeg-libs \
libhdhomerun-libs \
libxml2 \
libxslt && \
apk add --no-cache \
--repository http://nl.alpinelinux.org/alpine/edge/testing \
gnu-libiconv && \
# cleanup
apk del --purge \
build-dependencies && \