Compare commits

...

23 Commits

Author SHA1 Message Date
d7b79c567a Update to Factorio 0.17.70 2019-10-15 20:20:03 +00:00
3e62698b4b Update store links 2019-10-01 16:25:31 +02:00
d4870219f6 Added a link to Gog in addition to Factorio's website and Steam in the README.md (#290) 2019-10-01 11:48:30 +02:00
01194242b9 Update to Factorio 0.17.69 2019-09-19 15:32:52 +00:00
4255475b18 Update to Factorio 0.17.68 2019-09-04 17:49:55 +00:00
4ff8179912 Update to Factorio 0.17.67 2019-09-03 12:49:54 +00:00
db14988396 update to 0.17.66 2019-08-16 13:40:26 +00:00
cd29f2003b Load admin list in scenario (#288) 2019-08-16 13:58:59 +02:00
cd2d89a7bc update to 0.17.65 2019-08-14 11:35:26 +00:00
2d9f646728 Fix whitelist args in scenario entrypoint 2019-08-11 01:40:33 +02:00
9e96ca5aa8 update to 0.17.64 2019-08-09 19:24:45 +00:00
5c947846d1 Fix 0.17.63 SHA (#284) 2019-08-07 13:57:43 +02:00
edd0c95d9b update to 0.17.63 2019-08-06 12:20:39 +00:00
6651289d6e update to 0.17.62 2019-08-02 22:37:32 +00:00
784626b689 update to 0.17.61 2019-08-02 17:07:36 +00:00
47ce1706db update to 0.17.60 2019-07-30 14:37:31 +00:00
460ba0187d Update to 0.17.59 (#281)
* Update Dockerfile

* Update README.md
2019-07-26 00:28:10 +02:00
6d496def35 update to 0.17.58 2019-07-15 21:28:01 +00:00
9f8f6da0d2 update to 0.17.57 2019-07-15 17:43:15 +00:00
71c75671d5 Add debug code when sha match fails 2019-07-13 12:23:01 +02:00
5a66d1a8df Revert "Fix 0.17.56 sha"
This reverts commit a48b9d107d.
2019-07-13 12:22:21 +02:00
a48b9d107d Fix 0.17.56 sha 2019-07-13 12:05:08 +02:00
e5f34134f7 Apply shell-format 2019-07-13 12:04:34 +02:00
6 changed files with 63 additions and 59 deletions

View File

@ -5,16 +5,16 @@ LABEL maintainer="https://github.com/factoriotools/factorio-docker"
ENV VERSION=0.14.23 \ ENV VERSION=0.14.23 \
SHA1=6ef84341c6fc1cf45cfdd6acc8468aaa117b9e8a SHA1=6ef84341c6fc1cf45cfdd6acc8468aaa117b9e8a
RUN mkdir -p /opt && \ RUN mkdir -p /opt \
apk --no-cache add curl tini pwgen && \ && apk --no-cache add curl tini pwgen \
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.gz && \ -o /tmp/factorio_headless_x64_$VERSION.tar.gz \
echo "$SHA1 /tmp/factorio_headless_x64_$VERSION.tar.gz" | sha1sum -c && \ && echo "$SHA1 /tmp/factorio_headless_x64_$VERSION.tar.gz" | sha1sum -c \
tar xzf /tmp/factorio_headless_x64_$VERSION.tar.gz --directory /opt && \ && tar xzf /tmp/factorio_headless_x64_$VERSION.tar.gz --directory /opt \
rm /tmp/factorio_headless_x64_$VERSION.tar.gz && \ && rm /tmp/factorio_headless_x64_$VERSION.tar.gz \
apk del curl && \ && apk del curl \
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
VOLUME /factorio VOLUME /factorio

View File

@ -7,18 +7,18 @@ ENV PORT=34197 \
VERSION=0.15.40 \ VERSION=0.15.40 \
SHA1=f79a975f6b8c0ee87e2fa60f7d1f7133f332c3ec SHA1=f79a975f6b8c0ee87e2fa60f7d1f7133f332c3ec
RUN mkdir -p /opt && \ RUN mkdir -p /opt \
apk add --update --no-cache tini pwgen && \ && apk add --update --no-cache tini pwgen \
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 \
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 && \ && 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 \
apk del .build-deps && apk del .build-deps
VOLUME /factorio VOLUME /factorio

View File

@ -19,23 +19,23 @@ ENV PORT=34197 \
PUID="$PUID" \ PUID="$PUID" \
PGID="$PGID" PGID="$PGID"
RUN mkdir -p /opt /factorio && \ RUN mkdir -p /opt /factorio \
apk add --update --no-cache pwgen su-exec shadow && \ && apk add --update --no-cache pwgen su-exec shadow \
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 \
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 ugo=rwx /opt/factorio && \ && chmod ugo=rwx /opt/factorio \
rm /tmp/factorio_headless_x64_$VERSION.tar.xz && \ && rm /tmp/factorio_headless_x64_$VERSION.tar.xz \
ln -s $SAVES /opt/factorio/saves && \ && ln -s $SAVES /opt/factorio/saves \
ln -s $MODS /opt/factorio/mods && \ && ln -s $MODS /opt/factorio/mods \
ln -s $SCENARIOS /opt/factorio/scenarios && \ && ln -s $SCENARIOS /opt/factorio/scenarios \
ln -s $SCRIPTOUTPUT /opt/factorio/script-output && \ && ln -s $SCRIPTOUTPUT /opt/factorio/script-output \
apk del .build-deps && \ && apk del .build-deps \
addgroup -g $PGID -S $GROUP && \ && addgroup -g $PGID -S $GROUP \
adduser -u $PUID -G $GROUP -s /bin/sh -SDH $USER && \ && adduser -u $PUID -G $GROUP -s /bin/sh -SDH $USER \
chown -R $USER:$GROUP /opt/factorio /factorio && chown -R $USER:$GROUP /opt/factorio /factorio
VOLUME /factorio VOLUME /factorio

View File

@ -9,8 +9,8 @@ ARG PGID=845
ENV PORT=34197 \ ENV PORT=34197 \
RCON_PORT=27015 \ RCON_PORT=27015 \
VERSION=0.17.56 \ VERSION=0.17.70 \
SHA1=fdf609a314ab4100b1547b92f718ec24bc9c0eb4 \ SHA1=148d7297dfad1295fc7bb01d958ed26a73d98f4e \
SAVES=/factorio/saves \ SAVES=/factorio/saves \
CONFIG=/factorio/config \ CONFIG=/factorio/config \
MODS=/factorio/mods \ MODS=/factorio/mods \
@ -19,21 +19,23 @@ ENV PORT=34197 \
PUID="$PUID" \ PUID="$PUID" \
PGID="$PGID" PGID="$PGID"
RUN mkdir -p /opt /factorio && \ RUN set -ox pipefail \
apk add --update --no-cache --no-progress bash binutils curl gettext jq libintl pwgen shadow su-exec && \ && archive="/tmp/factorio_headless_x64_$VERSION.tar.xz" \
curl -sSL "https://www.factorio.com/get-download/$VERSION/headless/linux64" \ && mkdir -p /opt /factorio \
-o /tmp/factorio_headless_x64_$VERSION.tar.xz && \ && apk add --update --no-cache --no-progress bash binutils curl file gettext jq libintl pwgen shadow su-exec \
echo "$SHA1 /tmp/factorio_headless_x64_$VERSION.tar.xz" | sha1sum -c && \ && curl -sSL "https://www.factorio.com/get-download/$VERSION/headless/linux64" -o "$archive" \
tar xf "/tmp/factorio_headless_x64_$VERSION.tar.xz" --directory /opt && \ && echo "$SHA1 $archive" | sha1sum -c \
chmod ugo=rwx /opt/factorio && \ || (sha1sum "$archive" && file "$archive" && exit 1) \
rm "/tmp/factorio_headless_x64_$VERSION.tar.xz" && \ && tar xf "$archive" --directory /opt \
ln -s "$SAVES" /opt/factorio/saves && \ && chmod ugo=rwx /opt/factorio \
ln -s "$MODS" /opt/factorio/mods && \ && rm "$archive" \
ln -s "$SCENARIOS" /opt/factorio/scenarios && \ && ln -s "$SAVES" /opt/factorio/saves \
ln -s "$SCRIPTOUTPUT" /opt/factorio/script-output && \ && ln -s "$MODS" /opt/factorio/mods \
addgroup -g "$PGID" -S "$GROUP" && \ && ln -s "$SCENARIOS" /opt/factorio/scenarios \
adduser -u "$PUID" -G "$GROUP" -s /bin/sh -SDH "$USER" && \ && ln -s "$SCRIPTOUTPUT" /opt/factorio/script-output \
chown -R "$USER":"$GROUP" /opt/factorio /factorio && addgroup -g "$PGID" -S "$GROUP" \
&& adduser -u "$PUID" -G "$GROUP" -s /bin/sh -SDH "$USER" \
&& chown -R "$USER":"$GROUP" /opt/factorio /factorio
VOLUME /factorio VOLUME /factorio

View File

@ -33,8 +33,10 @@ exec /opt/factorio/bin/x64/factorio \
--port "$PORT" \ --port "$PORT" \
--start-server-load-scenario "$SERVER_SCENARIO" \ --start-server-load-scenario "$SERVER_SCENARIO" \
--server-settings "$CONFIG/server-settings.json" \ --server-settings "$CONFIG/server-settings.json" \
--server-whitelist "$CONFIG/server-whitelist.json" \
--server-banlist "$CONFIG/server-banlist.json" \ --server-banlist "$CONFIG/server-banlist.json" \
--server-whitelist "$CONFIG/server-whitelist.json" \
--use-server-whitelist \
--server-adminlist "$CONFIG/server-adminlist.json" \
--rcon-port "$RCON_PORT" \ --rcon-port "$RCON_PORT" \
--rcon-password "$(cat "$CONFIG/rconpw")" \ --rcon-password "$(cat "$CONFIG/rconpw")" \
--server-id /factorio/config/server-id.json --server-id /factorio/config/server-id.json

View File

@ -1,6 +1,6 @@
# Factorio [![Build Status](https://travis-ci.org/factoriotools/factorio-docker.svg?branch=master)](https://travis-ci.org/factoriotools/factorio-docker) [![Docker Version](https://images.microbadger.com/badges/version/factoriotools/factorio.svg)](https://hub.docker.com/r/factoriotools/factorio/) [![Docker Pulls](https://img.shields.io/docker/pulls/factoriotools/factorio.svg?maxAge=600)](https://hub.docker.com/r/factoriotools/factorio/) [![Docker Stars](https://img.shields.io/docker/stars/factoriotools/factorio.svg?maxAge=600)](https://hub.docker.com/r/factoriotools/factorio/) [![Microbadger Layers](https://images.microbadger.com/badges/image/factoriotools/factorio.svg)](https://microbadger.com/images/factoriotools/factorio "Get your own image badge on microbadger.com") # Factorio [![Build Status](https://travis-ci.org/factoriotools/factorio-docker.svg?branch=master)](https://travis-ci.org/factoriotools/factorio-docker) [![Docker Version](https://images.microbadger.com/badges/version/factoriotools/factorio.svg)](https://hub.docker.com/r/factoriotools/factorio/) [![Docker Pulls](https://img.shields.io/docker/pulls/factoriotools/factorio.svg?maxAge=600)](https://hub.docker.com/r/factoriotools/factorio/) [![Docker Stars](https://img.shields.io/docker/stars/factoriotools/factorio.svg?maxAge=600)](https://hub.docker.com/r/factoriotools/factorio/) [![Microbadger Layers](https://images.microbadger.com/badges/image/factoriotools/factorio.svg)](https://microbadger.com/images/factoriotools/factorio "Get your own image badge on microbadger.com")
* `0.17.56`, `0.17`, `latest` [(0.17/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.17/Dockerfile) * `0.17.70`, `0.17`, `latest` [(0.17/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.17/Dockerfile)
* `0.16.51`, `0.16`, `stable` [(0.16/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.16/Dockerfile) * `0.16.51`, `0.16`, `stable` [(0.16/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.16/Dockerfile)
* `0.15.40`, `0.15` [(0.15/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.15/Dockerfile) * `0.15.40`, `0.15` [(0.15/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.15/Dockerfile)
* `0.14.23`, `0.14` [(0.14/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.14/Dockerfile) * `0.14.23`, `0.14` [(0.14/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.14/Dockerfile)
@ -22,7 +22,7 @@ You will be mining resources, researching technologies, building infrastructure,
The game is very stable and optimized for building massive factories. You can create your own maps, write mods in Lua or play with friends via Multiplayer. The game is very stable and optimized for building massive factories. You can create your own maps, write mods in Lua or play with friends via Multiplayer.
NOTE: This is only the server. The game is available at [factorio.com](https://www.factorio.com) and [Steam](http://store.steampowered.com/app/427520/). NOTE: This is only the server. The full game is available at [Factorio.com](https://www.factorio.com), [Steam](https://store.steampowered.com/app/427520/), [GOG.com](https://www.gog.com/game/factorio) and [Humble Bundle](https://www.humblebundle.com/store/factorio).
# Usage # Usage