From 66d465230246e7d895f10f9d8d2e7dc17d158840 Mon Sep 17 00:00:00 2001
From: David Andersen <dta001@ucsd.edu>
Date: Mon, 12 Mar 2018 09:38:40 -0700
Subject: [PATCH] moved volume creation back as per PR#101; create symlink once

---
 0.16/Dockerfile           | 7 ++++---
 0.16/docker-entrypoint.sh | 3 ---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/0.16/Dockerfile b/0.16/Dockerfile
index 14821e1..e7c756d 100644
--- a/0.16/Dockerfile
+++ b/0.16/Dockerfile
@@ -7,8 +7,6 @@ ARG GROUP=factorio
 ARG PUID=845
 ARG PGID=845
 
-VOLUME /factorio
-
 ENV PORT=34197 \
     RCON_PORT=27015 \
     VERSION=0.16.29 \
@@ -32,7 +30,7 @@ RUN mkdir -p /opt /factorio && \
     adduser -u $PUID -G $GROUP -s /bin/sh -SDH $USER && \
     chown -R $USER:$GROUP /opt/factorio /factorio
 
-
+VOLUME /factorio
 
 EXPOSE $PORT/udp $RCON_PORT/tcp
 
@@ -40,6 +38,9 @@ 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
+ln -s -f /docker-entrypoint.sh $ENTRYPOINTS/docker-entrypoint.sh
+
 USER $USER
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/0.16/docker-entrypoint.sh b/0.16/docker-entrypoint.sh
index 5773d93..61d980e 100755
--- a/0.16/docker-entrypoint.sh
+++ b/0.16/docker-entrypoint.sh
@@ -16,9 +16,6 @@ mkdir -p $MODS
 mkdir -p $SCENARIOS
 mkdir -p $ENTRYPOINTS
 
-#symbolic link the default entrypoint to the entrypoints directory so it can be inspected and copied to new entrypoints
-ln -s -f /docker-entrypoint.sh $ENTRYPOINTS/docker-entrypoint.sh
-
 #chown -R factorio /factorio
 
 if [ ! -f $CONFIG/rconpw ]; then