deprecate cpu_core routine lack of scaling
This commit is contained in:
parent
94808c3b89
commit
f4428eacc5
23
Dockerfile
23
Dockerfile
@ -6,7 +6,7 @@ ARG VERSION
|
|||||||
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
||||||
LABEL maintainer="sparklyballs"
|
LABEL maintainer="sparklyballs"
|
||||||
|
|
||||||
# environment variables
|
# environment variables
|
||||||
ENV HOME="/config" \
|
ENV HOME="/config" \
|
||||||
MINETEST_SUBGAME_PATH="/config/.minetest/games"
|
MINETEST_SUBGAME_PATH="/config/.minetest/games"
|
||||||
|
|
||||||
@ -63,19 +63,7 @@ RUN \
|
|||||||
cd /tmp/spatialindex && \
|
cd /tmp/spatialindex && \
|
||||||
cmake . \
|
cmake . \
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr && \
|
-DCMAKE_INSTALL_PREFIX=/usr && \
|
||||||
echo "**** attempt to set number of cores available for make to use ****" && \
|
make && \
|
||||||
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 && \
|
||||||
echo "**** compile minetestserver ****" && \
|
echo "**** compile minetestserver ****" && \
|
||||||
git clone --depth 1 https://github.com/minetest/minetest.git /tmp/minetest && \
|
git clone --depth 1 https://github.com/minetest/minetest.git /tmp/minetest && \
|
||||||
@ -95,8 +83,7 @@ RUN \
|
|||||||
-DENABLE_SOUND=0 \
|
-DENABLE_SOUND=0 \
|
||||||
-DENABLE_SYSTEM_GMP=1 \
|
-DENABLE_SYSTEM_GMP=1 \
|
||||||
-DRUN_IN_PLACE=0 && \
|
-DRUN_IN_PLACE=0 && \
|
||||||
make -j $CPU_CORES && \
|
make && \
|
||||||
set +ex && \
|
|
||||||
make install && \
|
make install && \
|
||||||
echo "**** copy games to temporary folder ****" && \
|
echo "**** copy games to temporary folder ****" && \
|
||||||
mkdir -p \
|
mkdir -p \
|
||||||
@ -110,9 +97,9 @@ RUN \
|
|||||||
rm -rf \
|
rm -rf \
|
||||||
/tmp/*
|
/tmp/*
|
||||||
|
|
||||||
# add local files
|
# add local files
|
||||||
COPY root /
|
COPY root /
|
||||||
|
|
||||||
# ports and volumes
|
# ports and volumes
|
||||||
EXPOSE 30000/udp
|
EXPOSE 30000/udp
|
||||||
VOLUME /config/.minetest
|
VOLUME /config/.minetest
|
||||||
|
@ -76,6 +76,7 @@ You can find the world maps, mods folder and config files in /config/.minetest.
|
|||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
|
+ **03.01.18:** Deprecate cpu_core routine lack of scaling.
|
||||||
+ **08.12.17:** Rebase to alpine 3.7.
|
+ **08.12.17:** Rebase to alpine 3.7.
|
||||||
+ **30.11.17:** Use cpu core counting routine to speed up build time.
|
+ **30.11.17:** Use cpu core counting routine to speed up build time.
|
||||||
+ **26.05.17:** Rebase to alpine 3.6.
|
+ **26.05.17:** Rebase to alpine 3.6.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user