From eeb3e9bb2218a3273d7856bd7fa1f3981953970c Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Fri, 5 Jan 2018 17:09:16 +0000 Subject: [PATCH] deprecate cpu_core routine lack of scaling --- Dockerfile | 15 +-------------- README.md | 1 + 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 58c83df..679be43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 && \ diff --git a/README.md b/README.md index c6ee8c2..bbca50e 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,7 @@ To reverse proxy with our Letsencrypt docker container use the following locatio ## Versions ++ **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.