linuxserver/docker-minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8 from linuxserver/cpu_cores

Browse Source 
use cpu cores
This commit is contained in:
sparklyballs 2017-11-30 09:05:07 +00:00 committed by GitHub
commit 46ee62bf4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Dockerfile
View File

@ -67,7 +67,20 @@ apk add --no-cache \
cd /tmp/spatialindex && \ cd /tmp/spatialindex && \
cmake . \ cmake . \
-DCMAKE_INSTALL_PREFIX=/usr && \ -DCMAKE_INSTALL_PREFIX=/usr && \
make && \ # 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 && \
make install && \ make install && \
# compile minetestserver # compile minetestserver
@ -88,7 +101,8 @@ apk add --no-cache \
-DENABLE_SOUND=0 \ -DENABLE_SOUND=0 \
-DENABLE_SYSTEM_GMP=1 \ -DENABLE_SYSTEM_GMP=1 \
-DRUN_IN_PLACE=0 && \ -DRUN_IN_PLACE=0 && \
make && \ make -j $CPU_CORES && \
set +ex && \
make install && \ make install && \
# copy games to temporary folder # copy games to temporary folder

17
README.md
View File

@ -76,11 +76,12 @@ You can find the world maps, mods folder and config files in /config/.minetest.
## Versions ## Versions
+ **26.05.2017:** Rebase to alpine 3.6. + **30.11.17:** Use cpu core counting routine to speed up build time.
+ **14.02.2017:** Rebase to alpine 3.5. + **26.05.17:** Rebase to alpine 3.6.
+ **25.11.2016:** Rebase to alpine linux, move to main repo. + **14.02.17:** Rebase to alpine 3.5.
+ **27.02.2016:** Bump to latest version. + **25.11.16:** Rebase to alpine linux, move to main repo.
+ **19.02.2016:** Change port to UDP, thanks to slashopt for pointing this out. + **27.02.16:** Bump to latest version.
+ **15.02.2016:** Make minetest app a service. + **19.02.16:** Change port to UDP, thanks to slashopt for pointing this out.
+ **01-02-2016:** Add lua-socket dependency. + **15.02.16:** Make minetest app a service.
+ **06.11.2015:** Initial Release. + **01.02.16:** Add lua-socket dependency.
+ **06.11.15:** Initial Release.