mirror of
https://github.com/factoriotools/factorio-docker.git
synced 2024-12-26 02:48:23 +01:00
Merge branch '0.17-debug' into master
This commit is contained in:
commit
3cdf39d04b
@ -18,7 +18,7 @@ ENV PORT=34197 \
|
||||
SCRIPTOUTPUT=/factorio/script-output
|
||||
|
||||
RUN mkdir -p /opt /factorio && \
|
||||
apk add --update --no-cache pwgen && \
|
||||
apk add --update --no-cache pwgen su-exec && \
|
||||
apk add --update --no-cache --virtual .build-deps curl && \
|
||||
curl -sSL https://www.factorio.com/get-download/$VERSION/headless/linux64 \
|
||||
-o /tmp/factorio_headless_x64_$VERSION.tar.xz && \
|
||||
|
@ -2,7 +2,7 @@
|
||||
set -e
|
||||
|
||||
id
|
||||
|
||||
#
|
||||
FACTORIO_VOL=/factorio
|
||||
mkdir -p $FACTORIO_VOL
|
||||
mkdir -p $SAVES
|
||||
@ -19,10 +19,10 @@ if [ ! -f $CONFIG/server-settings.json ]; then
|
||||
cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json
|
||||
fi
|
||||
|
||||
#if [ ! -f $CONFIG/map-gen-settings.json ]; then
|
||||
if [ ! -f $CONFIG/map-gen-settings.json ]; then
|
||||
# cp /opt/factorio/data/map-gen-settings.example.json $CONFIG/map-gen-settings.json
|
||||
#fi
|
||||
echo "{}" > $CONFIG/map-gen-settings.json
|
||||
echo "{}" > $CONFIG/map-gen-settings.json
|
||||
fi
|
||||
|
||||
if [ ! -f $CONFIG/map-settings.json ]; then
|
||||
cp /opt/factorio/data/map-settings.example.json $CONFIG/map-settings.json
|
||||
@ -43,7 +43,7 @@ if [ "$(id -u)" = '0' ]; then
|
||||
chown -R factorio:factorio $FACTORIO_VOL
|
||||
fi
|
||||
|
||||
exec /opt/factorio/bin/x64/factorio \
|
||||
exec su-exec factorio /opt/factorio/bin/x64/factorio \
|
||||
--port $PORT \
|
||||
--start-server-load-latest \
|
||||
--server-settings $CONFIG/server-settings.json \
|
||||
|
Loading…
Reference in New Issue
Block a user