From 248c5469b88cb332d12826fac2f17794ef3e6b3d Mon Sep 17 00:00:00 2001 From: sparklyballs <sparklyballs@gmail.com> Date: Fri, 5 Jan 2018 17:27:16 +0000 Subject: [PATCH] bump_alpine_3.7 --- Dockerfile | 36 ++++++++++-------------------------- README.md | 1 + 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/Dockerfile b/Dockerfile index f867c0f..cc9ead7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ -FROM lsiobase/alpine.python.arm64:3.6 -MAINTAINER sparklyballs,chbmb +FROM lsiobase/alpine.python.arm64:3.7 # set version label ARG BUILD_DATE ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" +LABEL maintainer="chbmb" -# install build packages RUN \ + echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ file \ fontconfig-dev \ @@ -21,14 +21,14 @@ RUN \ libtool \ libwebp-dev \ libxml2-dev \ + libxslt-dev \ make \ perl-dev \ python2-dev \ tiff-dev \ xz \ zlib-dev && \ - -# install runtime packages + echo "**** install runtime packages ****" && \ apk add --no-cache \ fontconfig \ freetype \ @@ -39,10 +39,10 @@ RUN \ libpng \ libwebp \ libxml2 \ + libxslt \ tiff \ zlib && \ - -# compile imagemagic + echo "**** compile imagemagic ****" && \ IMAGEMAGICK_VER=$(curl --silent http://www.imagemagick.org/download/digest.rdf \ | grep ImageMagick-6.*tar.xz | sed 's/\(.*\).tar.*/\1/' \ | sed 's/^.*ImageMagick-/ImageMagick-/') && \ @@ -71,26 +71,11 @@ RUN \ --without-x \ --with-tiff \ --with-xml && \ -# 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 && \ - set +ex && \ + make && \ make install && \ find / -name '.packlist' -o -name 'perllocal.pod' \ -o -name '*.bs' -delete && \ - -# install calibre-web + echo "**** install calibre-web ****" && \ mkdir -p \ /app/calibre-web && \ curl -o \ @@ -104,8 +89,7 @@ RUN \ requirements.txt && \ pip install --no-cache-dir -U -r \ optional-requirements.txt && \ - -# cleanup + echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ rm -rf \ diff --git a/README.md b/README.md index 5ca4c1f..011dd9b 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,7 @@ To reverse proxy with our Letsencrypt docker container use the following locatio ## Versions ++ **05.01.18:** Rebase to alpine 3.7, Deprecate cpu_core routine lack of scaling. + **27.11.17:** Use cpu core counting routine to speed up build time. + **24.07.17:** Curl version for imagemagick. + **17.07.17:** Initial release