URL encode spaces

Closes #275
2025-07-16 05:53:29 +02:00 · 2019-07-08 16:59:40 +02:00
6 changed files with 59 additions and 63 deletions
--- a/0.14/Dockerfile
+++ b/0.14/Dockerfile
@ -5,16 +5,16 @@ LABEL maintainer="https://github.com/factoriotools/factorio-docker"
 ENV VERSION=0.14.23 \
    SHA1=6ef84341c6fc1cf45cfdd6acc8468aaa117b9e8a

-RUN mkdir -p /opt \
-    && apk --no-cache add curl tini pwgen \
-    && curl -sSL https://www.factorio.com/get-download/$VERSION/headless/linux64 \
-        -o /tmp/factorio_headless_x64_$VERSION.tar.gz \
-    && echo "$SHA1  /tmp/factorio_headless_x64_$VERSION.tar.gz" | sha1sum -c \
-    && tar xzf /tmp/factorio_headless_x64_$VERSION.tar.gz --directory /opt \
-    && rm /tmp/factorio_headless_x64_$VERSION.tar.gz \
-    && apk del curl \
-    && ln -s /factorio/saves /opt/factorio/saves \
-    && ln -s /factorio/mods /opt/factorio/mods
+RUN mkdir -p /opt && \
+    apk --no-cache add curl tini pwgen && \
+    curl -sSL https://www.factorio.com/get-download/$VERSION/headless/linux64 \
+        -o /tmp/factorio_headless_x64_$VERSION.tar.gz && \
+    echo "$SHA1  /tmp/factorio_headless_x64_$VERSION.tar.gz" | sha1sum -c && \
+    tar xzf /tmp/factorio_headless_x64_$VERSION.tar.gz --directory /opt && \
+    rm /tmp/factorio_headless_x64_$VERSION.tar.gz && \
+    apk del curl && \
+    ln -s /factorio/saves /opt/factorio/saves && \
+    ln -s /factorio/mods /opt/factorio/mods

 VOLUME /factorio

--- a/0.15/Dockerfile
+++ b/0.15/Dockerfile
@ -7,18 +7,18 @@ ENV PORT=34197 \
    VERSION=0.15.40 \
    SHA1=f79a975f6b8c0ee87e2fa60f7d1f7133f332c3ec

-RUN mkdir -p /opt \
-    && 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
+RUN mkdir -p /opt && \
+    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

 VOLUME /factorio

--- a/0.16/Dockerfile
+++ b/0.16/Dockerfile
@ -19,23 +19,23 @@ ENV PORT=34197 \
    PUID="$PUID" \
    PGID="$PGID"

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

 VOLUME /factorio

--- a/0.17/Dockerfile
+++ b/0.17/Dockerfile
@ -9,8 +9,8 @@ ARG PGID=845

 ENV PORT=34197 \
    RCON_PORT=27015 \
-    VERSION=0.17.70 \
-    SHA1=148d7297dfad1295fc7bb01d958ed26a73d98f4e \
+    VERSION=0.17.54 \
+    SHA1=69750604bc9036abdf5e9297dfc975f80b52c573 \
    SAVES=/factorio/saves \
    CONFIG=/factorio/config \
    MODS=/factorio/mods \
@ -19,23 +19,21 @@ ENV PORT=34197 \
    PUID="$PUID" \
    PGID="$PGID"

-RUN set -ox pipefail \
-    && archive="/tmp/factorio_headless_x64_$VERSION.tar.xz" \
-    && mkdir -p /opt /factorio \
-    && apk add --update --no-cache --no-progress bash binutils curl file gettext jq libintl pwgen shadow su-exec \
-    && curl -sSL "https://www.factorio.com/get-download/$VERSION/headless/linux64" -o "$archive" \
-    && echo "$SHA1  $archive" | sha1sum -c \
-    || (sha1sum "$archive" && file "$archive" && exit 1) \
-    && tar xf "$archive" --directory /opt \
-    && chmod ugo=rwx /opt/factorio \
-    && rm "$archive" \
-    && ln -s "$SAVES" /opt/factorio/saves \
-    && ln -s "$MODS" /opt/factorio/mods \
-    && ln -s "$SCENARIOS" /opt/factorio/scenarios \
-    && ln -s "$SCRIPTOUTPUT" /opt/factorio/script-output \
-    && addgroup -g "$PGID" -S "$GROUP" \
-    && adduser -u "$PUID" -G "$GROUP" -s /bin/sh -SDH "$USER" \
-    && chown -R "$USER":"$GROUP" /opt/factorio /factorio
+RUN mkdir -p /opt /factorio && \
+    apk add --update --no-cache --no-progress bash binutils curl gettext jq libintl pwgen shadow su-exec && \
+    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 ugo=rwx /opt/factorio && \
+    rm "/tmp/factorio_headless_x64_$VERSION.tar.xz" && \
+    ln -s "$SAVES" /opt/factorio/saves && \
+    ln -s "$MODS" /opt/factorio/mods && \
+    ln -s "$SCENARIOS" /opt/factorio/scenarios && \
+    ln -s "$SCRIPTOUTPUT" /opt/factorio/script-output && \
+    addgroup -g "$PGID" -S "$GROUP" && \
+    adduser -u "$PUID" -G "$GROUP" -s /bin/sh -SDH "$USER" && \
+    chown -R "$USER":"$GROUP" /opt/factorio /factorio

 VOLUME /factorio

--- a/0.17/files/scenario.sh
+++ b/0.17/files/scenario.sh
@ -33,10 +33,8 @@ exec /opt/factorio/bin/x64/factorio \
  --port "$PORT" \
  --start-server-load-scenario "$SERVER_SCENARIO" \
  --server-settings "$CONFIG/server-settings.json" \
-  --server-banlist "$CONFIG/server-banlist.json" \
  --server-whitelist "$CONFIG/server-whitelist.json" \
-  --use-server-whitelist \
-  --server-adminlist "$CONFIG/server-adminlist.json" \
+  --server-banlist "$CONFIG/server-banlist.json" \
  --rcon-port "$RCON_PORT" \
  --rcon-password "$(cat "$CONFIG/rconpw")" \
  --server-id /factorio/config/server-id.json
--- a/README.md
+++ b/README.md
@ -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")

-* `0.17.70`, `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.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)
@ -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.

-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).
+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/).


 # Usage