Fix migration when config is mounted

Fixes #317

0.14/Dockerfile

@@ -1,4 +1,4 @@
-FROM frolvlad/alpine-glibc:alpine-3.12
+FROM frolvlad/alpine-glibc:alpine-3.11
 
 LABEL maintainer="https://github.com/factoriotools/factorio-docker"
 

0.15/Dockerfile

@@ -1,4 +1,4 @@
-FROM frolvlad/alpine-glibc:alpine-3.12
+FROM frolvlad/alpine-glibc:alpine-3.11
 
 LABEL maintainer="https://github.com/factoriotools/factorio-docker"
 

0.16/Dockerfile

@@ -1,4 +1,4 @@
-FROM frolvlad/alpine-glibc:alpine-3.12
+FROM frolvlad/alpine-glibc:alpine-3.11
 
 LABEL maintainer="https://github.com/factoriotools/factorio-docker"
 

0.17/Dockerfile

@@ -1,4 +1,4 @@
-FROM frolvlad/alpine-glibc:alpine-3.12
+FROM frolvlad/alpine-glibc:alpine-3.11
 
 LABEL maintainer="https://github.com/factoriotools/factorio-docker"
 
@@ -30,8 +30,6 @@ RUN set -ox pipefail \
     && tar xf "$archive" --directory /opt \
     && chmod ugo=rwx /opt/factorio \
     && rm "$archive" \
-    && ln -s "$SCENARIOS" /opt/factorio/scenarios \
-    && ln -s "$SAVES" /opt/factorio/saves \
     && mkdir -p /opt/factorio/config/ \
     && addgroup -g "$PGID" -S "$GROUP" \
     && adduser -u "$PUID" -G "$GROUP" -s /bin/sh -SDH "$USER" \

0.17/files/docker-entrypoint.sh

@@ -37,7 +37,7 @@ if [[ $NRTMPSAVES -gt 0 ]]; then
   rm -f "$SAVES"/*.tmp.zip
 fi
 
-if [[ ${UPDATE_MODS_ON_START:-} == "true" ]]; then
+if [[ ${UPDATE_MODS_ON_START:-} ]]; then
   ./docker-update-mods.sh
 fi
 

0.17/files/scenario.sh

@@ -32,8 +32,6 @@ fi
 exec /opt/factorio/bin/x64/factorio \
   --port "$PORT" \
   --start-server-load-scenario "$SERVER_SCENARIO" \
-  --map-gen-settings "$CONFIG/map-gen-settings.json" \
-  --map-settings "$CONFIG/map-settings.json" \
   --server-settings "$CONFIG/server-settings.json" \
   --server-banlist "$CONFIG/server-banlist.json" \
   --server-whitelist "$CONFIG/server-whitelist.json" \

0.17/files/update-mods.sh

@@ -25,12 +25,11 @@ print_failure()
 
 update_mod()
 {
-  MOD_NAME="$1"
-  MOD_NAME_ENCODED="${1// /%20}"
+  MOD_NAME="${1// /%20}"
 
   print_step "Checking for update of mod $MOD_NAME..."
 
-  MOD_INFO_URL="$MOD_BASE_URL/api/mods/$MOD_NAME_ENCODED"
+  MOD_INFO_URL="$MOD_BASE_URL/api/mods/$MOD_NAME"
   MOD_INFO_JSON=$(curl --silent "$MOD_INFO_URL")
 
   if ! echo "$MOD_INFO_JSON" | jq -e .name >/dev/null; then

0.18/Dockerfile

@@ -1,4 +1,4 @@
-FROM frolvlad/alpine-glibc:alpine-3.12
+FROM frolvlad/alpine-glibc:alpine-3.11
 
 LABEL maintainer="https://github.com/factoriotools/factorio-docker"
 
@@ -9,8 +9,8 @@ ARG PGID=845
 
 ENV PORT=34197 \
     RCON_PORT=27015 \
-    VERSION=0.18.47 \
-    SHA1=32e23b0e83c41f6328d9270667330ee71f60837e \
+    VERSION=0.18.25 \
+    SHA1=5e79abcf4b68afb8896afc2df16a1c8e5b003eeb \
     SAVES=/factorio/saves \
     CONFIG=/factorio/config \
     MODS=/factorio/mods \
@@ -30,8 +30,6 @@ RUN set -ox pipefail \
     && tar xf "$archive" --directory /opt \
     && chmod ugo=rwx /opt/factorio \
     && rm "$archive" \
-    && ln -s "$SCENARIOS" /opt/factorio/scenarios \
-    && ln -s "$SAVES" /opt/factorio/saves \
     && mkdir -p /opt/factorio/config/ \
     && addgroup -g "$PGID" -S "$GROUP" \
     && adduser -u "$PUID" -G "$GROUP" -s /bin/sh -SDH "$USER" \

0.18/files/docker-entrypoint.sh

@@ -37,7 +37,7 @@ if [[ $NRTMPSAVES -gt 0 ]]; then
   rm -f "$SAVES"/*.tmp.zip
 fi
 
-if [[ ${UPDATE_MODS_ON_START:-} == "true" ]]; then
+if [[ ${UPDATE_MODS_ON_START:-} ]]; then
   ./docker-update-mods.sh
 fi
 

0.18/files/scenario.sh

@@ -32,8 +32,6 @@ fi
 exec /opt/factorio/bin/x64/factorio \
   --port "$PORT" \
   --start-server-load-scenario "$SERVER_SCENARIO" \
-  --map-gen-settings "$CONFIG/map-gen-settings.json" \
-  --map-settings "$CONFIG/map-settings.json" \
   --server-settings "$CONFIG/server-settings.json" \
   --server-banlist "$CONFIG/server-banlist.json" \
   --server-whitelist "$CONFIG/server-whitelist.json" \

0.18/files/update-mods.sh

@@ -25,12 +25,11 @@ print_failure()
 
 update_mod()
 {
-  MOD_NAME="$1"
-  MOD_NAME_ENCODED="${1// /%20}"
+  MOD_NAME="${1// /%20}"
 
   print_step "Checking for update of mod $MOD_NAME..."
 
-  MOD_INFO_URL="$MOD_BASE_URL/api/mods/$MOD_NAME_ENCODED"
+  MOD_INFO_URL="$MOD_BASE_URL/api/mods/$MOD_NAME"
   MOD_INFO_JSON=$(curl --silent "$MOD_INFO_URL")
 
   if ! echo "$MOD_INFO_JSON" | jq -e .name >/dev/null; then

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) ![Updater status](https://img.shields.io/endpoint?label=Updater%20status&logo=a&url=https%3A%2F%2Fhealthchecks.supersandro.de%2Fbadge%2F1a0a7698-445d-4e54-9e4b-f61a1544e01f%2FBO8VukOA%2Fmaintainer.shields) [![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.18.47`, `0.18`, `latest` [(0.18/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.18/Dockerfile)
+* `0.18.25`, `0.18`, `latest` [(0.18/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.18/Dockerfile)
 * `0.17.79`, `0.17`, `stable` [(0.17/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.17/Dockerfile)
 * `0.16.51`, `0.16` [(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)

build.sh

@@ -48,7 +48,7 @@ else
 fi
 
 # shellcheck disable=SC2068
-eval docker build . ${TAGS[@]:-}
+eval docker build . ${TAGS[@]}
 docker images
 
 # remove -1 from incremental tag