update to 0.16.42 (#161 )

Merge pull request #157 from afex/master
Expose script-output to mounted volume
2025-07-01 14:38:05 +02:00 · 2018-05-11 18:48:47 +02:00 · 2018-05-04 12:19:56 -07:00 · 2018-05-03 21:22:40 +02:00 · 2018-05-03 00:53:14 +02:00 · 2018-05-02 12:45:11 -07:00
5 changed files with 17 additions and 32 deletions
--- a/0.16/Dockerfile
+++ b/0.16/Dockerfile
@ -9,13 +9,13 @@ ARG PGID=845

 ENV PORT=34197 \
    RCON_PORT=27015 \
-    VERSION=0.16.30 \
-    SHA1=7ceac7d3cfee2c301707e2622400d2c7bc6f2e8c \
+    VERSION=0.16.42 \
+    SHA1=470ab5cbe036b5aedc51d577401ef37fbbdfeece \
    SAVES=/factorio/saves \
    CONFIG=/factorio/config \
    MODS=/factorio/mods \
    SCENARIOS=/factorio/scenarios \
-    ENTRYPOINTS=/factorio/entrypoints
+    SCRIPTOUTPUT=/factorio/script-output

 RUN mkdir -p /opt /factorio && \
    apk add --update --no-cache pwgen && \
@ -26,10 +26,10 @@ RUN mkdir -p /opt /factorio && \
    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 -f $SAVES /opt/factorio/saves && \
-    ln -s -f $MODS /opt/factorio/mods && \
-    ln -s -f $SCENARIOS /opt/factorio/scenarios && \
-    ln -s -f $ENTRYPOINTS /opt/factorio/entrypoints && \
+    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 && \
@ -39,12 +39,7 @@ VOLUME /factorio

 EXPOSE $PORT/udp $RCON_PORT/tcp

-COPY ./docker-entrypoint.sh /
-COPY ./scenario2map.sh /factorio/entrypoints
-COPY ./scenario.sh /factorio/entrypoints
-
-#symbolic link the default entrypoint to the entrypoints directory so it can be inspected and copied to new entrypoints
-#RUN ln -s -f /docker-entrypoint.sh $ENTRYPOINTS/docker-entrypoint.sh
+COPY files/ /

 USER $USER

--- a/0.16/files/docker-entrypoint.sh
+++ b/0.16/files/docker-entrypoint.sh
@ -8,9 +8,7 @@ mkdir -p $SAVES
 mkdir -p $CONFIG
 mkdir -p $MODS
 mkdir -p $SCENARIOS
-mkdir -p $ENTRYPOINTS
-
-#chown -R factorio /factorio
+mkdir -p $SCRIPTOUTPUT

 if [ ! -f $CONFIG/rconpw ]; then
  echo $(pwgen 15 1) > $CONFIG/rconpw
@ -28,6 +26,10 @@ 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 \*.tmp.zip -mindepth 1 -print | grep -q .; then
+  rm -f $SAVES/*.tmp.zip
+fi
+
 if ! find -L $SAVES -iname \*.zip -mindepth 1 -print | grep -q .; then
  /opt/factorio/bin/x64/factorio \
    --create $SAVES/_autosave1.zip  \
--- a/0.16/files/scenario.sh
+++ b/0.16/files/scenario.sh
@ -9,11 +9,6 @@ set -e

 id

-SAVES=/factorio/saves
-CONFIG=/factorio/config
-MODS=/factorio/mods
-SCENARIOS=/factorio/scenarios
-
 mkdir -p $SAVES
 mkdir -p $CONFIG
 mkdir -p $MODS
--- a/0.16/files/scenario2map.sh
+++ b/0.16/files/scenario2map.sh
@ -9,18 +9,11 @@ set -e

 id

-SAVES=/factorio/saves
-CONFIG=/factorio/config
-MODS=/factorio/mods
-SCENARIOS=/factorio/scenarios
-
 mkdir -p $SAVES
 mkdir -p $CONFIG
 mkdir -p $MODS
 mkdir -p $SCENARIOS

-#chown -R factorio /factorio
-
 if [ ! -f $CONFIG/server-settings.json ]; then
  cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json
 fi
--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@
 # Factorio [![](https://images.microbadger.com/badges/image/dtandersen/factorio.svg)](https://microbadger.com/images/dtandersen/factorio "Get your own image badge on microbadger.com") [![Docker Pulls](https://img.shields.io/docker/pulls/dtandersen/factorio.svg)](https://hub.docker.com/r/dtandersen/factorio/) [![Docker Stars](https://img.shields.io/docker/stars/dtandersen/factorio.svg)](https://hub.docker.com/r/dtandersen/factorio/)

-* `0.16.30`, `0.16`, `latest` [(0.16/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.16/Dockerfile)
-* `0.15.40`, `0.15`, `stable` [(0.15/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.15/Dockerfile)
+* `0.16.42`, `0.16`, `stable`, `latest` [(0.16/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.16/Dockerfile)
+* `0.15.40`, `0.15` [(0.15/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.15/Dockerfile)
 * `0.14.23`, `0.14` [(0.14/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.14/Dockerfile)
 * `0.13.20`, `0.13`  [(0.13/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.13/Dockerfile)

@ -124,7 +124,7 @@ docker run -d \
  -v /opt/factorio:/factorio \
  --name factorio \
  --restart=always  \
-  --entrypoint "/factorio/entrypoints/scenario.sh" \
+  --entrypoint "/scenario.sh" \
  dtandersen/factorio \
  MyScenarioName
 ```
@ -140,7 +140,7 @@ docker run -d \
  -v /opt/factorio:/factorio \
  --name factorio \
  --restart=always  \
-  --entrypoint "/factorio/entrypoints/scenario2map.sh" \
+  --entrypoint "/scenario2map.sh" \
  dtandersen/factorio
  MyScenarioName
 ```
Author	SHA1	Message	Date
Florian Kinder	b41aad4dc6	update to 0.16.42 (#161 )	2018-05-11 18:48:47 +02:00
David Andersen	24ac45dbce	Merge pull request #157 from afex/master Expose script-output to mounted volume	2018-05-04 12:19:56 -07:00
Florian Kinder	8286ab58ac	update to 0.16.41 (#159 )	2018-05-03 21:22:40 +02:00
Florian Kinder	c2d8509aa8	update to 0.16.40 (#158 )	2018-05-03 00:53:14 +02:00
keith	b94db83033	setup script-output directory	2018-05-02 12:45:11 -07:00
keith	cc23bb396e	expose script-output to volume	2018-05-02 12:44:34 -07:00
Florian Kinder	1b2fdb298f	update to 0.16.39 (#156 )	2018-04-30 20:00:30 +02:00
David Andersen	ab277975ae	Merge pull request #153 from dtandersen/update-0.16.38 Updated to version 0.16.38	2018-04-26 11:45:23 -07:00
Florian Kinder	80d8866242	update to 0.16.38	2018-04-26 15:24:39 +00:00
David Andersen	4ec18b2d15	Merge pull request #152 from dtandersen/update-0.16.37 Updated to version 0.16.37	2018-04-23 10:57:13 -07:00
Florian Kinder	93a3011cd3	update to 0.16.37	2018-04-23 17:44:49 +00:00
David Andersen	15cacdc3da	0.16 is stable	2018-03-29 09:44:34 -07:00
David Andersen	927bcb89a0	Merge pull request #150 from dtandersen/update-0.16.36 Updated to version 0.16.36	2018-03-28 09:40:26 -07:00
Florian Kinder	4ceff25fc2	update to 0.16.36	2018-03-28 12:54:40 +00:00
Florian Kinder	5d072db9cc	update to 0.16.35 (#149 )	2018-03-24 14:37:57 +01:00
Florian Kinder	216b225681	update to 0.16.34 (#148 )	2018-03-23 13:42:54 +01:00
David Andersen	18f3943eaf	Merge pull request #146 from dtandersen/update-0.16.33 Updated to version 0.16.33	2018-03-22 10:24:01 -07:00
Florian Kinder	2725534b2b	update to 0.16.33	2018-03-22 17:04:41 +00:00
David Andersen	df35d57455	Merge pull request #145 from dtandersen/update-0.16.32 Updated to version 0.16.32	2018-03-20 08:20:37 -07:00
Florian Kinder	9adc8ce4bc	update to 0.16.32	2018-03-20 12:54:39 +00:00
Florian Kinder	6272bb0018	update to 0.16.31 (#144 )	2018-03-19 20:37:39 +01:00
David Andersen	a989b500b0	moved entrypoints to files directory	2018-03-19 17:28:40 +00:00
David Andersen	66bef56cd2	moved entry points to /; dont put hard link in place of entrypoint folder	2018-03-19 16:58:53 +00:00
David Andersen	10f891cabf	don't need to create these	2018-03-14 13:16:23 -07:00
David Andersen	9a7f01f8bf	Merge pull request #142 from yukienterprises/temp-save-removal Remove temp (invalid) saves on container start	2018-03-14 07:56:50 -07:00
Yuki Hyou	877219f9c9	Remove temp (invalid) saves on container start	2018-03-14 23:13:43 +11:00