bump to alpine 3.7 and fix continuation lines

This commit is contained in:
sparklyballs 2017-12-06 10:49:38 +00:00
parent 54a25b28a4
commit 74bf9187bc
2 changed files with 26 additions and 17 deletions

View file

@ -1,13 +1,13 @@
FROM lsiobase/alpine:3.6 FROM lsiobase/alpine:3.7
MAINTAINER sparklyballs
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="sparklybals"
# install build packages
RUN \ RUN \
echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \ apk add --no-cache --virtual=build-dependencies \
cmake \ cmake \
ffmpeg-dev \ ffmpeg-dev \
@ -19,16 +19,15 @@ RUN \
make \ make \
openjpeg-dev \ openjpeg-dev \
python2-dev && \ python2-dev && \
echo "**** install runtime packages ****" && \
# install runtime packages
apk add --no-cache \ apk add --no-cache \
curl \ curl \
expat \ expat \
ffmpeg \ ffmpeg \
ffmpeg-libs \ ffmpeg-libs \
gdbm \ gdbm \
gst-plugins-good1 \ gst-plugins-good \
gstreamer1 \ gstreamer \
jpeg \ jpeg \
lame \ lame \
libffi \ libffi \
@ -41,8 +40,7 @@ RUN \
sqlite-libs \ sqlite-libs \
tar \ tar \
wget && \ wget && \
echo "**** compile mp3gain ****" && \
# compile mp3gain
mkdir -p \ mkdir -p \
/tmp/mp3gain-src && \ /tmp/mp3gain-src && \
curl -o \ curl -o \
@ -51,10 +49,21 @@ RUN \
cd /tmp/mp3gain-src && \ cd /tmp/mp3gain-src && \
unzip -qq /tmp/mp3gain-src/mp3gain.zip && \ unzip -qq /tmp/mp3gain-src/mp3gain.zip && \
sed -i "s#/usr/local/bin#/usr/bin#g" /tmp/mp3gain-src/Makefile && \ sed -i "s#/usr/local/bin#/usr/bin#g" /tmp/mp3gain-src/Makefile && \
make && \ echo "**** attempt to set number of cores available for make to use ****" && \
set -ex && \
CPU_CORES=$( < /proc/cpuinfo grep -c processor ) || echo "failed cpu look up" && \
if echo $CPU_CORES | grep -E -q '^[0-9]+$'; then \
: ;\
if [ "$CPU_CORES" -gt 7 ]; then \
CPU_CORES=$(( CPU_CORES - 3 )); \
elif [ "$CPU_CORES" -gt 5 ]; then \
CPU_CORES=$(( CPU_CORES - 2 )); \
elif [ "$CPU_CORES" -gt 3 ]; then \
CPU_CORES=$(( CPU_CORES - 1 )); fi \
else CPU_CORES="1"; fi && \
make -j $CPU_CORES && \
make install && \ make install && \
echo "**** compile chromaprint ****" && \
# compile chromaprint
git clone https://bitbucket.org/acoustid/chromaprint.git \ git clone https://bitbucket.org/acoustid/chromaprint.git \
/tmp/chromaprint && \ /tmp/chromaprint && \
cd /tmp/chromaprint && \ cd /tmp/chromaprint && \
@ -62,10 +71,10 @@ RUN \
-DBUILD_TOOLS=ON \ -DBUILD_TOOLS=ON \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX:PATH=/usr && \ -DCMAKE_INSTALL_PREFIX:PATH=/usr && \
make && \ make -j $CPU_CORES && \
set +ex && \
make install && \ make install && \
echo "**** install pip packages ****" && \
# install pip packages
pip install --no-cache-dir -U \ pip install --no-cache-dir -U \
beets \ beets \
beets-copyartifacts \ beets-copyartifacts \
@ -75,8 +84,7 @@ RUN \
pyacoustid \ pyacoustid \
pylast \ pylast \
unidecode && \ unidecode && \
echo "**** cleanup ****" && \
# cleanup
apk del --purge \ apk del --purge \
build-dependencies && \ build-dependencies && \
rm -rf \ rm -rf \

View file

@ -85,6 +85,7 @@ Contains [beets-copyartifacts](https://github.com/sbarakat/beets-copyartifacts)
## Versions ## Versions
+ **06.12.17:** Rebase to alpine linux 3.7.
+ **25.05.17:** Rebase to alpine linux 3.6. + **25.05.17:** Rebase to alpine linux 3.6.
+ **06.02.17:** Rebase to alpine linux 3.5. + **06.02.17:** Rebase to alpine linux 3.5.
+ **16.01.17:** Add packages required for replaygain. + **16.01.17:** Add packages required for replaygain.