Merge pull request #11 from linuxserver/deprecate_cpu_core

deprecate cpu_core routine lack of scaling
This commit is contained in:
sparklyballs 2018-01-05 19:31:01 +00:00 committed by GitHub
commit fec0a1c28f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 14 deletions

View File

@ -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 && \

View File

@ -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.