Compare commits

..

1 Commits

Author SHA1 Message Date
472369d36f URL encode spaces
Closes #275
2019-07-08 16:59:40 +02:00
6 changed files with 57 additions and 60 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.64 \ VERSION=0.17.54 \
SHA1=2aee450d933f68dcb2f36a37b7c05756bc56786f \ SHA1=69750604bc9036abdf5e9297dfc975f80b52c573 \
SAVES=/factorio/saves \ SAVES=/factorio/saves \
CONFIG=/factorio/config \ CONFIG=/factorio/config \
MODS=/factorio/mods \ MODS=/factorio/mods \
@ -19,23 +19,21 @@ ENV PORT=34197 \
PUID="$PUID" \ PUID="$PUID" \
PGID="$PGID" PGID="$PGID"
RUN set -ox pipefail \ RUN mkdir -p /opt /factorio && \
&& archive="/tmp/factorio_headless_x64_$VERSION.tar.xz" \ apk add --update --no-cache --no-progress bash binutils curl gettext jq libintl pwgen shadow su-exec && \
&& mkdir -p /opt /factorio \ curl -sSL "https://www.factorio.com/get-download/$VERSION/headless/linux64" \
&& apk add --update --no-cache --no-progress bash binutils curl file gettext jq libintl pwgen shadow su-exec \ -o /tmp/factorio_headless_x64_$VERSION.tar.xz && \
&& curl -sSL "https://www.factorio.com/get-download/$VERSION/headless/linux64" -o "$archive" \ echo "$SHA1 /tmp/factorio_headless_x64_$VERSION.tar.xz" | sha1sum -c && \
&& echo "$SHA1 $archive" | sha1sum -c \ tar xf "/tmp/factorio_headless_x64_$VERSION.tar.xz" --directory /opt && \
|| (sha1sum "$archive" && file "$archive" && exit 1) \ chmod ugo=rwx /opt/factorio && \
&& tar xf "$archive" --directory /opt \ rm "/tmp/factorio_headless_x64_$VERSION.tar.xz" && \
&& chmod ugo=rwx /opt/factorio \ ln -s "$SAVES" /opt/factorio/saves && \
&& rm "$archive" \ ln -s "$MODS" /opt/factorio/mods && \
&& ln -s "$SAVES" /opt/factorio/saves \ ln -s "$SCENARIOS" /opt/factorio/scenarios && \
&& ln -s "$MODS" /opt/factorio/mods \ ln -s "$SCRIPTOUTPUT" /opt/factorio/script-output && \
&& ln -s "$SCENARIOS" /opt/factorio/scenarios \ addgroup -g "$PGID" -S "$GROUP" && \
&& ln -s "$SCRIPTOUTPUT" /opt/factorio/script-output \ adduser -u "$PUID" -G "$GROUP" -s /bin/sh -SDH "$USER" && \
&& addgroup -g "$PGID" -S "$GROUP" \ chown -R "$USER":"$GROUP" /opt/factorio /factorio
&& adduser -u "$PUID" -G "$GROUP" -s /bin/sh -SDH "$USER" \
&& chown -R "$USER":"$GROUP" /opt/factorio /factorio
VOLUME /factorio VOLUME /factorio

View File

@ -34,7 +34,6 @@ exec /opt/factorio/bin/x64/factorio \
--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-whitelist "$CONFIG/server-whitelist.json" \
--use-server-whitelist \
--server-banlist "$CONFIG/server-banlist.json" \ --server-banlist "$CONFIG/server-banlist.json" \
--rcon-port "$RCON_PORT" \ --rcon-port "$RCON_PORT" \
--rcon-password "$(cat "$CONFIG/rconpw")" \ --rcon-password "$(cat "$CONFIG/rconpw")" \

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.64`, `0.17`, `latest` [(0.17/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.17/Dockerfile) * `0.17.54`, `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)