add shellcheck warning disables, earlier "fix" actually broke run script
This commit is contained in:
parent
92dd34bd43
commit
e99f7705d1
@ -38,6 +38,10 @@ RUN \
|
|||||||
python-dev \
|
python-dev \
|
||||||
sqlite-dev && \
|
sqlite-dev && \
|
||||||
|
|
||||||
|
apk add --no-cache --virtual=build-dependencies \
|
||||||
|
--repository http://nl.alpinelinux.org/alpine/edge/testing \
|
||||||
|
leveldb-dev && \
|
||||||
|
|
||||||
# install runtime packages
|
# install runtime packages
|
||||||
apk add --no-cache \
|
apk add --no-cache \
|
||||||
curl \
|
curl \
|
||||||
@ -51,6 +55,10 @@ RUN \
|
|||||||
sqlite \
|
sqlite \
|
||||||
sqlite-libs && \
|
sqlite-libs && \
|
||||||
|
|
||||||
|
apk add --no-cache \
|
||||||
|
--repository http://nl.alpinelinux.org/alpine/edge/testing \
|
||||||
|
leveldb && \
|
||||||
|
|
||||||
# compile spatialindex
|
# compile spatialindex
|
||||||
git clone https://github.com/libspatialindex/libspatialindex /tmp/spatialindex && \
|
git clone https://github.com/libspatialindex/libspatialindex /tmp/spatialindex && \
|
||||||
cd /tmp/spatialindex && \
|
cd /tmp/spatialindex && \
|
||||||
@ -72,6 +80,7 @@ RUN \
|
|||||||
-DCUSTOM_SHAREDIR="/usr/share/minetest" \
|
-DCUSTOM_SHAREDIR="/usr/share/minetest" \
|
||||||
-DENABLE_CURL=1 \
|
-DENABLE_CURL=1 \
|
||||||
-DENABLE_GETTEXT=1 \
|
-DENABLE_GETTEXT=1 \
|
||||||
|
-DENABLE_LEVELDB=1 \
|
||||||
-DENABLE_LUAJIT=1 \
|
-DENABLE_LUAJIT=1 \
|
||||||
-DENABLE_REDIS=1 \
|
-DENABLE_REDIS=1 \
|
||||||
-DENABLE_SOUND=0 \
|
-DENABLE_SOUND=0 \
|
||||||
|
@ -1,17 +1,18 @@
|
|||||||
#!/usr/bin/with-contenv bash
|
#!/usr/bin/with-contenv bash
|
||||||
|
|
||||||
declare world
|
|
||||||
# predefine some variables
|
# predefine some variables
|
||||||
world_part="--world "
|
world_part="--world "
|
||||||
|
# shellcheck disable=SC2154
|
||||||
world_set=$world
|
world_set=$world
|
||||||
|
|
||||||
# set WORLD_STRING variable to use user-defined world or default world.
|
# set world_string variable to use user-defined world or default world.
|
||||||
if [ -z "$world" ]; then
|
if [ -z "$world" ]; then
|
||||||
WORLD_STRING=" "
|
world_string=" "
|
||||||
else
|
else
|
||||||
WORLD_STRING=($world_part$world_set)
|
world_string=$world_part$world_set
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# shellcheck disable=SC2086
|
||||||
exec \
|
exec \
|
||||||
s6-setuidgid abc minetestserver "${WORLD_STRING[@]}" \
|
s6-setuidgid abc minetestserver $world_string \
|
||||||
--config /config/.minetest/main-config/minetest.conf --port 30000
|
--config /config/.minetest/main-config/minetest.conf --port 30000
|
||||||
|
Loading…
x
Reference in New Issue
Block a user