Merge pull request #10 from linuxserver/3.7

bump to alpine 3.7 and fix continuation lines

Dockerfile

@@ -1,16 +1,13 @@
-FROM lsiobase/alpine.python:3.6
-MAINTAINER sparklyballs,chbmb
+FROM lsiobase/alpine.python:3.7
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="chbmb"
 
-# package versions
-ARG IMAGEMAGICK_VER="6.9.9-0"
-
-# install build packages
 RUN \
+ echo "**** install build packages ****" && \
  apk add --no-cache --virtual=build-dependencies \
 	file \
 	fontconfig-dev \
@@ -24,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 \
@@ -42,15 +39,18 @@ 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-/') && \
  mkdir -p \
 	/tmp/imagemagick && \
  curl -o \
  /tmp/imagemagick-src.tar.xz -L \
-	"http://www.imagemagick.org/download/releases/ImageMagick-${IMAGEMAGICK_VER}.tar.xz" && \
+	"http://www.imagemagick.org/download/${IMAGEMAGICK_VER}.tar.xz" && \
  tar xf \
  /tmp/imagemagick-src.tar.xz -C \
 	/tmp/imagemagick --strip-components=1 && \
@@ -71,12 +71,24 @@ RUN \
 	--without-x \
 	--with-tiff \
 	--with-xml && \
- 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 && \
+ set +ex && \
  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 \
@@ -90,8 +102,7 @@ RUN \
 	requirements.txt && \
  pip install --no-cache-dir -U -r \
 	optional-requirements.txt && \
-
-# cleanup
+ echo "**** cleanup ****" && \
  apk del --purge \
 	build-dependencies && \
  rm -rf \

README.md

@@ -98,4 +98,7 @@ To reverse proxy with our Letsencrypt docker container use the following locatio
 
 ## Versions
 
-+ **17.07.17:** Initial release
++ **06.12.17:** Rebase to alpine 3.7.
++ **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.