mirror/factorio-docker
1
0
Fork 0
mirror of https://github.com/factoriotools/factorio-docker.git synced 2024-12-27 03:18:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.17-debug' into master

Browse Source
This commit is contained in:
installgen2 2019-02-26 21:19:14 +00:00 committed by GitHub
commit 3cdf39d04b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0.17/Dockerfile
View File

@ -18,7 +18,7 @@ ENV PORT=34197 \
SCRIPTOUTPUT=/factorio/script-output SCRIPTOUTPUT=/factorio/script-output
RUN mkdir -p /opt /factorio && \ 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 && \ apk add --update --no-cache --virtual .build-deps curl && \
curl -sSL https://www.factorio.com/get-download/$VERSION/headless/linux64 \ curl -sSL https://www.factorio.com/get-download/$VERSION/headless/linux64 \
-o /tmp/factorio_headless_x64_$VERSION.tar.xz && \ -o /tmp/factorio_headless_x64_$VERSION.tar.xz && \

10
0.17/files/docker-entrypoint.sh
View File

@ -2,7 +2,7 @@
set -e set -e
id id
#
FACTORIO_VOL=/factorio FACTORIO_VOL=/factorio
mkdir -p $FACTORIO_VOL mkdir -p $FACTORIO_VOL
mkdir -p $SAVES 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 cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json
fi 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 # 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 if [ ! -f $CONFIG/map-settings.json ]; then
cp /opt/factorio/data/map-settings.example.json $CONFIG/map-settings.json 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 chown -R factorio:factorio $FACTORIO_VOL
fi fi
exec /opt/factorio/bin/x64/factorio \ exec su-exec factorio /opt/factorio/bin/x64/factorio \
--port $PORT \ --port $PORT \
--start-server-load-latest \ --start-server-load-latest \
--server-settings $CONFIG/server-settings.json \ --server-settings $CONFIG/server-settings.json \