Merge pull request #24 from linuxserver/rebase_alpine_3.8

rebase to alpine 3.8
2018-08-16 14:30:17 +01:00 · 2018-08-16 13:00:45 +01:00 · 2018-07-03 22:05:36 +01:00 · 2018-07-03 21:30:03 +01:00 · 2018-07-03 21:11:05 +01:00 · 2018-01-05 19:31:01 +00:00
2 changed files with 6 additions and 16 deletions
@@ -1,4 +1,4 @@
-FROM lsiobase/alpine.python:3.7
+FROM lsiobase/alpine.python:3.8

 # set version label
 ARG BUILD_DATE
@@ -44,7 +44,7 @@ RUN \
 	zlib && \
 echo "**** compile imagemagic ****" && \
 IMAGEMAGICK_VER=$(curl --silent http://www.imagemagick.org/download/digest.rdf \
-	| grep ImageMagick-6.*tar.xz | sed 's/\(.*\).tar.*/\1/' \
+	| grep ImageMagick-6.*tar.gz | sed 's/\(.*\).tar.*/\1/' \
 	| sed 's/^.*ImageMagick-/ImageMagick-/') && \
 mkdir -p \
 	/tmp/imagemagick && \
@@ -71,20 +71,7 @@ RUN \
 	--without-x \
 	--with-tiff \
 	--with-xml && \
- 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 && \
 make install && \
 find / -name '.packlist' -o -name 'perllocal.pod' \
 	-o -name '*.bs' -delete && \
@@ -98,6 +98,9 @@ To reverse proxy with our Letsencrypt docker container use the following locatio

 ## Versions

+ **16.08.18:** Rebase to alpine 3.8.
+ **03.07.18:** New build pushed, all versions below `67` have [vulnerability](https://github.com/janeczku/calibre-web/issues/534)
+ **05.01.18:** Deprecate cpu_core routine lack of scaling.
 + **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.
Author	SHA1	Message	Date
sparklyballs	25cd75cbb2	Merge pull request #24 from linuxserver/rebase_alpine_3.8 rebase to alpine 3.8	2018-08-16 14:30:17 +01:00
sparklyballs	c2db793227	rebase to alpine 3.8	2018-08-16 13:00:45 +01:00
chbmb	2473f3ba34	Merge pull request #21 from linuxserver/vulnerability Readme updated with note about vulnerability	2018-07-03 22:05:36 +01:00
sparklyballs	3a3064b3e2	tweak grep	2018-07-03 21:30:03 +01:00
chbmb	10286b3309	Readme updated with note about vulnerability Push new build to remove this [vulnerability](https://github.com/janeczku/calibre-web/issues/534)	2018-07-03 21:11:05 +01:00
sparklyballs	fec0a1c28f	Merge pull request #11 from linuxserver/deprecate_cpu_core deprecate cpu_core routine lack of scaling	2018-01-05 19:31:01 +00:00
sparklyballs	eeb3e9bb22	deprecate cpu_core routine lack of scaling	2018-01-05 17:09:16 +00:00