Compare commits

...

6 Commits

Author SHA1 Message Date
8091c3a9f9 0.16.0 2017-12-13 18:43:01 +00:00
cb5bc74e4b run as factorio user 2017-12-13 18:33:51 +00:00
1ce5c5db7e added 0.16 2017-12-13 08:54:30 -08:00
e2e7cc7798 remove chmod +x because file is already executable 2017-12-12 10:14:49 -08:00
487d345480 Merge pull request #89 from luliu/patch-1
Allowing non-root user to run factorio
2017-12-12 10:14:03 -08:00
7a276adb3c Allowing non-root user to run factorio
When starting the container with `docker run -d -u $(id -u factorio):$(id -g factorio) ...`, permission is denied upon trying to create `/opt/factorio/.lock` file.
This permission tweak will allow caller to pass desired user from host to container such that the permissions are retained correctly when games are saved to the mount.

Also, it just feels wrong to run factorio as root, container or not.  :)
2017-12-06 15:46:45 -05:00
4 changed files with 114 additions and 0 deletions

View File

@ -14,6 +14,7 @@ RUN mkdir /opt && \
-o /tmp/factorio_headless_x64_$VERSION.tar.xz && \ -o /tmp/factorio_headless_x64_$VERSION.tar.xz && \
echo "$SHA1 /tmp/factorio_headless_x64_$VERSION.tar.xz" | sha1sum -c && \ echo "$SHA1 /tmp/factorio_headless_x64_$VERSION.tar.xz" | sha1sum -c && \
tar xf /tmp/factorio_headless_x64_$VERSION.tar.xz --directory /opt && \ tar xf /tmp/factorio_headless_x64_$VERSION.tar.xz --directory /opt && \
chmod -R ugo=rwx /opt/factorio && \
rm /tmp/factorio_headless_x64_$VERSION.tar.xz && \ rm /tmp/factorio_headless_x64_$VERSION.tar.xz && \
ln -s /factorio/saves /opt/factorio/saves && \ ln -s /factorio/saves /opt/factorio/saves && \
ln -s /factorio/mods /opt/factorio/mods && \ ln -s /factorio/mods /opt/factorio/mods && \

56
0.16/Dockerfile Normal file
View File

@ -0,0 +1,56 @@
FROM frolvlad/alpine-glibc:alpine-3.6
#FROM ubuntu:18.04
MAINTAINER https://github.com/dtandersen/docker_factorio_server
ARG USER=factorio
ARG GROUP=factorio
ARG PUID=845
ARG PGID=845
ENV PORT=34197 \
RCON_PORT=27015 \
VERSION=0.16.0 \
SHA1=b4d8d6db02aff914b823d5f525c0f0f2acd9c355
# VERSION=0.15.40 \
# SHA1=f79a975f6b8c0ee87e2fa60f7d1f7133f332c3ec
VOLUME /factorio
RUN mkdir -p /opt && \
# apt-get update && \
# apt-get install -y curl xz-utils
apk add --update --no-cache tini pwgen && \
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 && \
echo "$SHA1 /tmp/factorio_headless_x64_$VERSION.tar.xz" | sha1sum -c && \
tar xf /tmp/factorio_headless_x64_$VERSION.tar.xz --directory /opt && \
chmod -R ugo=rwx /opt/factorio && \
rm /tmp/factorio_headless_x64_$VERSION.tar.xz && \
ln -s /factorio/saves /opt/factorio/saves && \
ln -s /factorio/mods /opt/factorio/mods && \
apk del .build-deps && \
addgroup -g $PGID -S $GROUP && \
adduser -u $PUID -G $USER -s /bin/sh -SDH $GROUP && \
chown -R $USER:$GROUP /opt/factorio /factorio
EXPOSE $PORT/udp $RCON_PORT/tcp
COPY ./docker-entrypoint.sh /
#USER $USER
#ENTRYPOINT ["/sbin/tini", "--"]
#CMD ["/docker-entrypoint.sh"]
ENTRYPOINT ["/docker-entrypoint.sh"]
CMD ["/opt/factorio/bin/x64/factorio", \
"--port", "$PORT", \
"--start-server-load-latest", \
"--server-settings $CONFIG/server-settings.json", \
"--server-whitelist $CONFIG/server-whitelist.json", \
"--server-banlist $CONFIG/server-banlist.json", \
"--rcon-port $RCON_PORT", \
"--rcon-password", "$(cat $CONFIG/rconpw)", \
"--server-id /factorio/config/server-id.json" \
]

9
0.16/docker-compose.yml Normal file
View File

@ -0,0 +1,9 @@
version: '2'
services:
factorio:
build: .
ports:
- "34197:34197"
volumes:
- /opt/factorio:/factorio
user: 1001:1001

48
0.16/docker-entrypoint.sh Executable file
View File

@ -0,0 +1,48 @@
#!/bin/sh -x
set -e
id
SAVES=/factorio/saves
CONFIG=/factorio/config
mkdir -p $SAVES
mkdir -p /factorio/mods
mkdir -p $CONFIG
#chown -R factorio /factorio
if [ ! -f $CONFIG/rconpw ]; then
echo $(pwgen 15 1) > $CONFIG/rconpw
fi
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
cp /opt/factorio/data/map-gen-settings.example.json $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
fi
if ! find -L $SAVES -iname \*.zip -mindepth 1 -print | grep -q .; then
/opt/factorio/bin/x64/factorio \
--create $SAVES/_autosave1.zip \
--map-gen-settings $CONFIG/map-gen-settings.json \
--map-settings $CONFIG/map-settings.json
fi
#exec "$@"
exec /opt/factorio/bin/x64/factorio \
--port $PORT \
--start-server-load-latest \
--server-settings $CONFIG/server-settings.json \
--server-whitelist $CONFIG/server-whitelist.json \
--server-banlist $CONFIG/server-banlist.json \
--rcon-port $RCON_PORT \
--rcon-password "$(cat $CONFIG/rconpw)" \
--server-id /factorio/config/server-id.json