From 741874ed29e4b844707c601e37a2674674b71493 Mon Sep 17 00:00:00 2001
From: Joe Stratton <joe.stratton@asu.edu>
Date: Sun, 17 May 2020 09:42:29 -0700
Subject: [PATCH 01/19] updating to new terraria and tmod version

---
 Dockerfile | 4 ++--
 README.md  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c35d68a..bab49f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM frolvlad/alpine-glibc:alpine-3.10 as build
 
-ARG TMOD_VERSION=0.11.6.2
-ARG TERRARIA_VERSION=1353
+ARG TMOD_VERSION=0.11.7
+ARG TERRARIA_VERSION=1401
 
 RUN apk update &&\
     apk add --no-cache --virtual build curl unzip &&\
diff --git a/README.md b/README.md
index ff66882..0b242a1 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [tModLoader] dedicated server  
 
-Terraria server 1.3.5.3 with tModLoader v0.11.6.2.
+Terraria server 1.4.0.1 with tModLoader v0.11.7
 
 Supports graceful shutdown (saves when the container receives a stop command) and also supports autosaving every 10 minutes (configurable, see [Environment Variables] below).
 

From 9cc702c897a6d976207910c27fa09e3d50e7d331 Mon Sep 17 00:00:00 2001
From: Joe Stratton <joe.stratton@asu.edu>
Date: Sun, 17 May 2020 09:52:27 -0700
Subject: [PATCH 02/19] addingt travis testing back in

---
 .travis.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..08d2e73
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,21 @@
+language: python
+
+services:
+  - docker
+
+jobs:
+    include:
+      - stage: build docker image
+        script:
+        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+        - docker build -t tmodloader-docker .
+        - docker images
+        - docker tag tmodloader-docker $DOCKER_USERNAME/tmodloader-docker
+        - docker push $DOCKER_USERNAME/tmodloader-docker
+      - stage: pull docker image
+        script: 
+        - docker pull $DOCKER_USERNAME/tmodloader-docker
+      - stage: run docker image
+        script:
+        - docker run -d --name Terraria -p 7777:7777 -v /etc/localtime:/etc/localtime:ro $DOCKER_USERNAME/tmodloader-docker
+        - docker ps -a
\ No newline at end of file

From 77fda3a0ad0774a9793432f3630687b61e83989e Mon Sep 17 00:00:00 2001
From: Joe Stratton <joe.stratton@asu.edu>
Date: Sun, 17 May 2020 10:03:02 -0700
Subject: [PATCH 03/19] adding unzip rather than tar for tmod files

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index bab49f7..ad425f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,8 @@ RUN curl -SLO "http://terraria.org/server/terraria-server-${TERRARIA_VERSION}.zi
     rm -rf "${TERRARIA_VERSION}" &&\
     rm TerrariaServer.bin.x86 TerrariaServer.exe
 
-RUN curl -SL "https://github.com/tModLoader/tModLoader/releases/download/v${TMOD_VERSION}/tModLoader.Linux.v${TMOD_VERSION}.tar.gz" | tar -xvz &&\
+RUN curl -SL "https://github.com/tModLoader/tModLoader/releases/download/v${TMOD_VERSION}/tModLoader.Linux.v${TMOD_VERSION}.zip" &&\
+    unzip tModLoader.Linux.v*.zip &&\\
     chmod u+x tModLoaderServer* Terraria TerrariaServer.* &&\
     mv TerrariaServer.bin.x86_64 tModLoaderServer.bin.x86_64 &&\
     rm *.txt *.jar

From c45e6bd9aca1ab8a9b5fda170608ee8474dd8d89 Mon Sep 17 00:00:00 2001
From: Joe Stratton <joe.stratton@asu.edu>
Date: Sun, 17 May 2020 10:11:26 -0700
Subject: [PATCH 04/19] adding zip arguments to tmodload server

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ad425f4..faa10ce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ RUN curl -SLO "http://terraria.org/server/terraria-server-${TERRARIA_VERSION}.zi
     rm -rf "${TERRARIA_VERSION}" &&\
     rm TerrariaServer.bin.x86 TerrariaServer.exe
 
-RUN curl -SL "https://github.com/tModLoader/tModLoader/releases/download/v${TMOD_VERSION}/tModLoader.Linux.v${TMOD_VERSION}.zip" &&\
+RUN curl -SLO "https://github.com/tModLoader/tModLoader/releases/download/v${TMOD_VERSION}/tModLoader.Linux.v${TMOD_VERSION}.zip" &&\
     unzip tModLoader.Linux.v*.zip &&\\
     chmod u+x tModLoaderServer* Terraria TerrariaServer.* &&\
     mv TerrariaServer.bin.x86_64 tModLoaderServer.bin.x86_64 &&\

From c15b1d1dbb68870d0bb729ece4836efed21a5822 Mon Sep 17 00:00:00 2001
From: Joe Stratton <joe.stratton@asu.edu>
Date: Sun, 17 May 2020 10:19:54 -0700
Subject: [PATCH 05/19] fixng new file structure for tmodloader 11.7

---
 Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index faa10ce..7344162 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,9 +20,7 @@ RUN curl -SLO "http://terraria.org/server/terraria-server-${TERRARIA_VERSION}.zi
 
 RUN curl -SLO "https://github.com/tModLoader/tModLoader/releases/download/v${TMOD_VERSION}/tModLoader.Linux.v${TMOD_VERSION}.zip" &&\
     unzip tModLoader.Linux.v*.zip &&\\
-    chmod u+x tModLoaderServer* Terraria TerrariaServer.* &&\
-    mv TerrariaServer.bin.x86_64 tModLoaderServer.bin.x86_64 &&\
-    rm *.txt *.jar
+    chmod u+x tModLoaderServer* tModLoaderServer.bin.*
 
 FROM frolvlad/alpine-glibc:alpine-3.10
 

From 477692614e8b6ade448cf4a6c16ca8618b06ff99 Mon Sep 17 00:00:00 2001
From: Joe Stratton <joe.stratton@asu.edu>
Date: Sun, 17 May 2020 11:10:31 -0700
Subject: [PATCH 06/19] updated base image version to solve error code

---
 Dockerfile | 91 +++++++++++++++++++++++++++---------------------------
 1 file changed, 46 insertions(+), 45 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7344162..cebd589 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,45 +1,46 @@
-FROM frolvlad/alpine-glibc:alpine-3.10 as build
-
-ARG TMOD_VERSION=0.11.7
-ARG TERRARIA_VERSION=1401
-
-RUN apk update &&\
-    apk add --no-cache --virtual build curl unzip &&\
-    apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing mono
-
-WORKDIR /terraria-server
-
-RUN cp /usr/lib/libMonoPosixHelper.so .
-
-RUN curl -SLO "http://terraria.org/server/terraria-server-${TERRARIA_VERSION}.zip" &&\
-    unzip terraria-server-*.zip &&\
-    rm terraria-server-*.zip &&\
-    cp --verbose -a "${TERRARIA_VERSION}/Linux/." . &&\
-    rm -rf "${TERRARIA_VERSION}" &&\
-    rm TerrariaServer.bin.x86 TerrariaServer.exe
-
-RUN curl -SLO "https://github.com/tModLoader/tModLoader/releases/download/v${TMOD_VERSION}/tModLoader.Linux.v${TMOD_VERSION}.zip" &&\
-    unzip tModLoader.Linux.v*.zip &&\\
-    chmod u+x tModLoaderServer* tModLoaderServer.bin.*
-
-FROM frolvlad/alpine-glibc:alpine-3.10
-
-WORKDIR /terraria-server
-COPY --from=build /terraria-server ./
-
-RUN apk update &&\
-    apk add --no-cache procps tmux
-RUN ln -s ${HOME}/.local/share/Terraria/ /terraria
-COPY inject.sh /usr/local/bin/inject
-COPY handle-idle.sh /usr/local/bin/handle-idle
-
-EXPOSE 7777
-ENV TMOD_SHUTDOWN_MSG="Shutting down!"
-ENV TMOD_AUTOSAVE_INTERVAL="*/10 * * * *"
-ENV TMOD_IDLE_CHECK_INTERVAL=""
-ENV TMOD_IDLE_CHECK_OFFSET=0
-
-COPY config.txt entrypoint.sh ./
-RUN chmod +x entrypoint.sh /usr/local/bin/inject /usr/local/bin/handle-idle
-
-ENTRYPOINT [ "/terraria-server/entrypoint.sh" ]
+FROM frolvlad/alpine-glibc:alpine-3.11 as build
+
+ARG TMOD_VERSION=0.11.7
+ARG TERRARIA_VERSION=1401
+
+RUN apk update &&\
+    apk add --no-cache --virtual build curl unzip &&\
+    apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing mono
+
+WORKDIR /terraria-server
+
+RUN cp /usr/lib/libMonoPosixHelper.so .
+
+RUN curl -SLO "http://terraria.org/server/terraria-server-${TERRARIA_VERSION}.zip" &&\
+    unzip terraria-server-*.zip &&\
+    rm terraria-server-*.zip &&\
+    cp --verbose -a "${TERRARIA_VERSION}/Linux/." . &&\
+    rm -rf "${TERRARIA_VERSION}" &&\
+    rm TerrariaServer.bin.x86 TerrariaServer.exe
+
+RUN curl -SLO "https://github.com/tModLoader/tModLoader/releases/download/v${TMOD_VERSION}/tModLoader.Linux.v${TMOD_VERSION}.zip" &&\
+    unzip tModLoader.Linux.v*.zip &&\
+    rm tModLoader.Linux.v*.zip &&\
+    chmod u+x tModLoaderServer* tModLoaderServer.bin.*
+
+FROM frolvlad/alpine-glibc:alpine-3.11
+
+WORKDIR /terraria-server
+COPY --from=build /terraria-server ./
+
+RUN apk update &&\
+    apk add --no-cache procps tmux
+RUN ln -s ${HOME}/.local/share/Terraria/ /terraria
+COPY inject.sh /usr/local/bin/inject
+COPY handle-idle.sh /usr/local/bin/handle-idle
+
+EXPOSE 7777
+ENV TMOD_SHUTDOWN_MSG="Shutting down!"
+ENV TMOD_AUTOSAVE_INTERVAL="*/10 * * * *"
+ENV TMOD_IDLE_CHECK_INTERVAL=""
+ENV TMOD_IDLE_CHECK_OFFSET=0
+
+COPY config.txt entrypoint.sh ./
+RUN chmod +x entrypoint.sh /usr/local/bin/inject /usr/local/bin/handle-idle
+
+ENTRYPOINT [ "/terraria-server/entrypoint.sh" ]

From e5da61c3d93b7b35e380ced7ba0d9be515e4e1bb Mon Sep 17 00:00:00 2001
From: Joe Stratton <joe.stratton@asu.edu>
Date: Sun, 17 May 2020 11:56:43 -0700
Subject: [PATCH 07/19] fixed unzip error with forced overwrite -o

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index cebd589..5d5d16e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ RUN curl -SLO "http://terraria.org/server/terraria-server-${TERRARIA_VERSION}.zi
     rm TerrariaServer.bin.x86 TerrariaServer.exe
 
 RUN curl -SLO "https://github.com/tModLoader/tModLoader/releases/download/v${TMOD_VERSION}/tModLoader.Linux.v${TMOD_VERSION}.zip" &&\
-    unzip tModLoader.Linux.v*.zip &&\
+    unzip -o tModLoader.Linux.v*.zip &&\
     rm tModLoader.Linux.v*.zip &&\
     chmod u+x tModLoaderServer* tModLoaderServer.bin.*
 

From 4dc340628bd631b92a4fab3400aa02b6ac6a76e0 Mon Sep 17 00:00:00 2001
From: Joe Stratton <joe.stratton@asu.edu>
Date: Mon, 18 May 2020 09:02:06 -0700
Subject: [PATCH 08/19] updating tmod and terraria - still broken until tmod
 updates

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5d5d16e..c32cb0e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM frolvlad/alpine-glibc:alpine-3.11 as build
 
-ARG TMOD_VERSION=0.11.7
-ARG TERRARIA_VERSION=1401
+ARG TMOD_VERSION=0.11.7.1
+ARG TERRARIA_VERSION=1402
 
 RUN apk update &&\
     apk add --no-cache --virtual build curl unzip &&\

From 2ebcec7546f5ada6ed89a24e8391541b666c9b32 Mon Sep 17 00:00:00 2001
From: Joe Stratton <joe.stratton@asu.edu>
Date: Mon, 18 May 2020 09:02:58 -0700
Subject: [PATCH 09/19] updating tmod and terraria - still broken until tmod
 updates

---
 .README.md.un~ | Bin 0 -> 1087 bytes
 README.md      |   4 +--
 README.md~     |  86 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+), 2 deletions(-)
 create mode 100644 .README.md.un~
 create mode 100644 README.md~

diff --git a/.README.md.un~ b/.README.md.un~
new file mode 100644
index 0000000000000000000000000000000000000000..c8499fb55b0c69896a15c92005099628b8c4acbb
GIT binary patch
literal 1087
zcmWH`%$*;a=aT=Ffk`N7+170b%3A;C)H^Y~p4}FH*dp1@#EU0}fAU)AmeU^?7#PBU
zSU)7Ss3@^0Gf|;9wWut$NWoCgM9)CaP@z1tBtxOZH$TNEKQRR;UIr92)H4TaVFhAw
zAZ7$&CLjg@5Dmi&afddpWC6)CGQ?j1$pQgPA&3o<f*Hc_9|*uAAem7>gAf2l$5L=~
zFfe?T0GiJN#B4weihfX3keUQc8^N&((uxc~F${`TeURX2tb#&;mH-&5E1;Q-lvp*w
Lm9b45pRWP{eDhgm

literal 0
HcmV?d00001

diff --git a/README.md b/README.md
index 0b242a1..0ea00b9 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [tModLoader] dedicated server  
 
-Terraria server 1.4.0.1 with tModLoader v0.11.7
+Terraria server 1.4.0.2 with tModLoader v0.11.7.1
 
 Supports graceful shutdown (saves when the container receives a stop command) and also supports autosaving every 10 minutes (configurable, see [Environment Variables] below).
 
@@ -83,4 +83,4 @@ TMOD_IDLE_CHECK_OFFSET   | 0              | This allows for sub-minute resolutio
 [directly]: https://github.com/tModLoader/tModLoader/wiki/Mod-Browser#direct-download
 [Environment Variables]: #environment-variables
 [game-manager]: https://hub.docker.com/r/rfvgyhn/game-manager/
-[0]: https://hub.docker.com/r/rfvgyhn/tmodloader
\ No newline at end of file
+[0]: https://hub.docker.com/r/rfvgyhn/tmodloader
diff --git a/README.md~ b/README.md~
new file mode 100644
index 0000000..0b242a1
--- /dev/null
+++ b/README.md~
@@ -0,0 +1,86 @@
+# tModLoader Docker ![tMod Version] ![Terraria Version]  [![Docker Pulls]][0]
+
+[tModLoader] dedicated server  
+
+Terraria server 1.4.0.1 with tModLoader v0.11.7
+
+Supports graceful shutdown (saves when the container receives a stop command) and also supports autosaving every 10 minutes (configurable, see [Environment Variables] below).
+
+## Quick Start
+
+    docker run -d --name tmod -p 7777:7777 -v /etc/localtime:/etc/localtime:ro rfvgyhn/tmodloader
+
+# Adding worlds
+
+    docker run -d --name tmod -p 7777:7777 -v /etc/localtime:/etc/localtime:ro -v $(pwd)/data:/terraria rfvgyhn/tmodloader
+
+# Server Config File
+
+You can mount a config file. This allows you to specify server and world settings. If you don't specify one, a [default] will be used. See [wiki] for file format details.
+
+    docker run -d --name tmod -p 7777:7777 -v /etc/localtime:/etc/localtime:ro -v $(pwd)/data:/terraria -v $(pwd)/config.txt:/terraria-server/config.txt rfvgyhn/tmodloader
+
+# Initial Setup
+
+If you want to use the server's mod browser to install and enable mods, run an interactive container with the `setup` parameter appended to the end.
+
+    docker run -it --rm -v $(pwd)/data:/terraria rfvgyhn/tmodloader setup
+
+After setting up your mods, and optionally setting up a world, press `Ctrl+C` to exit the container. Then you can use the normal docker command to run your server. Note that you'll see the mods and the `enabled.json` files appear in your mods folder on the host.
+
+You can also skip this step and [directly] download your mods. Place the mod files in your `data/ModLoader/Mods` folder and make sure to enable them in the `data/ModLoader/Mods/enabled.json` file.
+
+# Sending Commands to the Server
+
+This container is designed to be run in headless mode. This means you you can't manually type [commands] like you would on a normal Terraria server.
+You can inject [commands] from the host machine though. For example, assuming your container is named _tmod_:
+
+    docker exec tmod inject "kick player1"
+    docker exec tmod inject "say NOT THE BEEES!!!"
+
+# Environment Variables
+
+Name                     | Default Value  | |
+-------------------------|----------------|-
+TMOD_SHUTDOWN_MSG        | Shutting Down! | Message that appears when server is shutting down
+TMOD_AUTOSAVE_INTERVAL   | */10 * * * *   | Cron expression that specifies how often to save the world. Default is every 10 minutes.
+TMOD_IDLE_CHECK_INTERVAL | Disabled       | Cron expression that specifies how often to check if no players are online. If none are online, the server will save the world and exit. This can be useful if your server costs are based on CPU usage. Pairs well with [game-manager].
+TMOD_IDLE_CHECK_OFFSET   | 0              | This allows for sub-minute resolution if the idle check interval is specified
+
+    docker run -d --name tmod \
+               -e TMOD_SHUTDOWN_MSG="Goodbye" \
+               -e TMOD_AUTOSAVE_INTERVAL="*/15 * * * *" \
+               -e TMOD_IDLE_CHECK_INTERVAL="*/1 * * * *" \
+               -e TMOD_IDLE_CHECK_OFFSET=10 \
+               -p 7777:7777 \
+               -v /etc/localtime:/etc/localtime:ro \
+               rfvgyhn/tmodloader
+
+# Sample Docker Compose
+
+    version: '3'
+    services:
+        tmod:
+            image: 'rfvgyhn/tmodloader:latest'
+            container_name: 'tmod'
+            ports:
+                - '7777:7777'
+            volumes:
+                - /etc/localtime:/etc/localtime:ro
+                - ./data:/terraria
+                - ./config.txt:/terraria-server/config.txt
+            environment:
+                - TMOD_SHUTDOWN_MSG="See ya!"
+
+[tModLoader]: https://www.tmodloader.net/
+[wiki]: https://terraria.gamepedia.com/Server#Server_config_file
+[commands]: https://terraria.gamepedia.com/Server#List_of_console_commands
+[tMod Version]: https://img.shields.io/badge/tMod-0.11.6.2-blue
+[Terraria Version]: https://img.shields.io/badge/Terraria-1.3.5.3-blue
+[Docker Stars]: https://img.shields.io/docker/stars/rfvgyhn/tmodloader.svg
+[Docker Pulls]: https://img.shields.io/docker/pulls/rfvgyhn/tmodloader.svg
+[default]: https://github.com/Rfvgyhn/tmodloader-docker/blob/master/config.txt
+[directly]: https://github.com/tModLoader/tModLoader/wiki/Mod-Browser#direct-download
+[Environment Variables]: #environment-variables
+[game-manager]: https://hub.docker.com/r/rfvgyhn/game-manager/
+[0]: https://hub.docker.com/r/rfvgyhn/tmodloader
\ No newline at end of file

From 029228dfccd1637abd324423d281f70af1b2a229 Mon Sep 17 00:00:00 2001
From: Joe Stratton <joe.stratton@asu.edu>
Date: Mon, 18 May 2020 09:03:31 -0700
Subject: [PATCH 10/19] updating tmod and terraria - still broken until tmod
 updates

---
 .README.md.un~ | Bin 1087 -> 0 bytes
 README.md~     |  86 -------------------------------------------------
 2 files changed, 86 deletions(-)
 delete mode 100644 .README.md.un~
 delete mode 100644 README.md~

diff --git a/.README.md.un~ b/.README.md.un~
deleted file mode 100644
index c8499fb55b0c69896a15c92005099628b8c4acbb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1087
zcmWH`%$*;a=aT=Ffk`N7+170b%3A;C)H^Y~p4}FH*dp1@#EU0}fAU)AmeU^?7#PBU
zSU)7Ss3@^0Gf|;9wWut$NWoCgM9)CaP@z1tBtxOZH$TNEKQRR;UIr92)H4TaVFhAw
zAZ7$&CLjg@5Dmi&afddpWC6)CGQ?j1$pQgPA&3o<f*Hc_9|*uAAem7>gAf2l$5L=~
zFfe?T0GiJN#B4weihfX3keUQc8^N&((uxc~F${`TeURX2tb#&;mH-&5E1;Q-lvp*w
Lm9b45pRWP{eDhgm

diff --git a/README.md~ b/README.md~
deleted file mode 100644
index 0b242a1..0000000
--- a/README.md~
+++ /dev/null
@@ -1,86 +0,0 @@
-# tModLoader Docker ![tMod Version] ![Terraria Version]  [![Docker Pulls]][0]
-
-[tModLoader] dedicated server  
-
-Terraria server 1.4.0.1 with tModLoader v0.11.7
-
-Supports graceful shutdown (saves when the container receives a stop command) and also supports autosaving every 10 minutes (configurable, see [Environment Variables] below).
-
-## Quick Start
-
-    docker run -d --name tmod -p 7777:7777 -v /etc/localtime:/etc/localtime:ro rfvgyhn/tmodloader
-
-# Adding worlds
-
-    docker run -d --name tmod -p 7777:7777 -v /etc/localtime:/etc/localtime:ro -v $(pwd)/data:/terraria rfvgyhn/tmodloader
-
-# Server Config File
-
-You can mount a config file. This allows you to specify server and world settings. If you don't specify one, a [default] will be used. See [wiki] for file format details.
-
-    docker run -d --name tmod -p 7777:7777 -v /etc/localtime:/etc/localtime:ro -v $(pwd)/data:/terraria -v $(pwd)/config.txt:/terraria-server/config.txt rfvgyhn/tmodloader
-
-# Initial Setup
-
-If you want to use the server's mod browser to install and enable mods, run an interactive container with the `setup` parameter appended to the end.
-
-    docker run -it --rm -v $(pwd)/data:/terraria rfvgyhn/tmodloader setup
-
-After setting up your mods, and optionally setting up a world, press `Ctrl+C` to exit the container. Then you can use the normal docker command to run your server. Note that you'll see the mods and the `enabled.json` files appear in your mods folder on the host.
-
-You can also skip this step and [directly] download your mods. Place the mod files in your `data/ModLoader/Mods` folder and make sure to enable them in the `data/ModLoader/Mods/enabled.json` file.
-
-# Sending Commands to the Server
-
-This container is designed to be run in headless mode. This means you you can't manually type [commands] like you would on a normal Terraria server.
-You can inject [commands] from the host machine though. For example, assuming your container is named _tmod_:
-
-    docker exec tmod inject "kick player1"
-    docker exec tmod inject "say NOT THE BEEES!!!"
-
-# Environment Variables
-
-Name                     | Default Value  | |
--------------------------|----------------|-
-TMOD_SHUTDOWN_MSG        | Shutting Down! | Message that appears when server is shutting down
-TMOD_AUTOSAVE_INTERVAL   | */10 * * * *   | Cron expression that specifies how often to save the world. Default is every 10 minutes.
-TMOD_IDLE_CHECK_INTERVAL | Disabled       | Cron expression that specifies how often to check if no players are online. If none are online, the server will save the world and exit. This can be useful if your server costs are based on CPU usage. Pairs well with [game-manager].
-TMOD_IDLE_CHECK_OFFSET   | 0              | This allows for sub-minute resolution if the idle check interval is specified
-
-    docker run -d --name tmod \
-               -e TMOD_SHUTDOWN_MSG="Goodbye" \
-               -e TMOD_AUTOSAVE_INTERVAL="*/15 * * * *" \
-               -e TMOD_IDLE_CHECK_INTERVAL="*/1 * * * *" \
-               -e TMOD_IDLE_CHECK_OFFSET=10 \
-               -p 7777:7777 \
-               -v /etc/localtime:/etc/localtime:ro \
-               rfvgyhn/tmodloader
-
-# Sample Docker Compose
-
-    version: '3'
-    services:
-        tmod:
-            image: 'rfvgyhn/tmodloader:latest'
-            container_name: 'tmod'
-            ports:
-                - '7777:7777'
-            volumes:
-                - /etc/localtime:/etc/localtime:ro
-                - ./data:/terraria
-                - ./config.txt:/terraria-server/config.txt
-            environment:
-                - TMOD_SHUTDOWN_MSG="See ya!"
-
-[tModLoader]: https://www.tmodloader.net/
-[wiki]: https://terraria.gamepedia.com/Server#Server_config_file
-[commands]: https://terraria.gamepedia.com/Server#List_of_console_commands
-[tMod Version]: https://img.shields.io/badge/tMod-0.11.6.2-blue
-[Terraria Version]: https://img.shields.io/badge/Terraria-1.3.5.3-blue
-[Docker Stars]: https://img.shields.io/docker/stars/rfvgyhn/tmodloader.svg
-[Docker Pulls]: https://img.shields.io/docker/pulls/rfvgyhn/tmodloader.svg
-[default]: https://github.com/Rfvgyhn/tmodloader-docker/blob/master/config.txt
-[directly]: https://github.com/tModLoader/tModLoader/wiki/Mod-Browser#direct-download
-[Environment Variables]: #environment-variables
-[game-manager]: https://hub.docker.com/r/rfvgyhn/game-manager/
-[0]: https://hub.docker.com/r/rfvgyhn/tmodloader
\ No newline at end of file

From b8ac3355228f2d38f3899ce56d21dcf91df354ed Mon Sep 17 00:00:00 2001
From: Joe Stratton <joe.stratton@asu.edu>
Date: Mon, 18 May 2020 09:14:34 -0700
Subject: [PATCH 11/19] updated terraria server download url, note this will
 still not work until tmodloader is updated

---
 Dockerfile |  2 +-
 README.md  | 25 ++++++++++++-------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c32cb0e..4ae51b0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ WORKDIR /terraria-server
 
 RUN cp /usr/lib/libMonoPosixHelper.so .
 
-RUN curl -SLO "http://terraria.org/server/terraria-server-${TERRARIA_VERSION}.zip" &&\
+RUN curl -SLO "https://terraria.org/system/dedicated_servers/archives/000/000/036/original/terraria-server-${TMOD_VERSION}.zip" &&\
     unzip terraria-server-*.zip &&\
     rm terraria-server-*.zip &&\
     cp --verbose -a "${TERRARIA_VERSION}/Linux/." . &&\
diff --git a/README.md b/README.md
index 0ea00b9..1c68e22 100644
--- a/README.md
+++ b/README.md
@@ -8,23 +8,23 @@ Supports graceful shutdown (saves when the container receives a stop command) an
 
 ## Quick Start
 
-    docker run -d --name tmod -p 7777:7777 -v /etc/localtime:/etc/localtime:ro rfvgyhn/tmodloader
+    docker run -d --name tmod -p 7777:7777 -v /etc/localtime:/etc/localtime:ro j123ss/tmodloader-docker
 
 # Adding worlds
 
-    docker run -d --name tmod -p 7777:7777 -v /etc/localtime:/etc/localtime:ro -v $(pwd)/data:/terraria rfvgyhn/tmodloader
+    docker run -d --name tmod -p 7777:7777 -v /etc/localtime:/etc/localtime:ro -v $(pwd)/data:/terraria j123ss/tmodloader-docker
 
 # Server Config File
 
 You can mount a config file. This allows you to specify server and world settings. If you don't specify one, a [default] will be used. See [wiki] for file format details.
 
-    docker run -d --name tmod -p 7777:7777 -v /etc/localtime:/etc/localtime:ro -v $(pwd)/data:/terraria -v $(pwd)/config.txt:/terraria-server/config.txt rfvgyhn/tmodloader
+    docker run -d --name tmod -p 7777:7777 -v /etc/localtime:/etc/localtime:ro -v $(pwd)/data:/terraria -v $(pwd)/config.txt:/terraria-server/config.txt j123ss/tmodloader-docker
 
 # Initial Setup
 
 If you want to use the server's mod browser to install and enable mods, run an interactive container with the `setup` parameter appended to the end.
 
-    docker run -it --rm -v $(pwd)/data:/terraria rfvgyhn/tmodloader setup
+    docker run -it --rm -v $(pwd)/data:/terraria j123ss/tmodloader-docker setup
 
 After setting up your mods, and optionally setting up a world, press `Ctrl+C` to exit the container. Then you can use the normal docker command to run your server. Note that you'll see the mods and the `enabled.json` files appear in your mods folder on the host.
 
@@ -54,14 +54,14 @@ TMOD_IDLE_CHECK_OFFSET   | 0              | This allows for sub-minute resolutio
                -e TMOD_IDLE_CHECK_OFFSET=10 \
                -p 7777:7777 \
                -v /etc/localtime:/etc/localtime:ro \
-               rfvgyhn/tmodloader
+               j123ss/tmodloader-docker
 
 # Sample Docker Compose
 
     version: '3'
     services:
         tmod:
-            image: 'rfvgyhn/tmodloader:latest'
+            image: 'j123ss/tmodloader-docker:latest'
             container_name: 'tmod'
             ports:
                 - '7777:7777'
@@ -75,12 +75,11 @@ TMOD_IDLE_CHECK_OFFSET   | 0              | This allows for sub-minute resolutio
 [tModLoader]: https://www.tmodloader.net/
 [wiki]: https://terraria.gamepedia.com/Server#Server_config_file
 [commands]: https://terraria.gamepedia.com/Server#List_of_console_commands
-[tMod Version]: https://img.shields.io/badge/tMod-0.11.6.2-blue
-[Terraria Version]: https://img.shields.io/badge/Terraria-1.3.5.3-blue
-[Docker Stars]: https://img.shields.io/docker/stars/rfvgyhn/tmodloader.svg
-[Docker Pulls]: https://img.shields.io/docker/pulls/rfvgyhn/tmodloader.svg
-[default]: https://github.com/Rfvgyhn/tmodloader-docker/blob/master/config.txt
+[tMod Version]: https://img.shields.io/badge/tMod-0.11.7.1-blue
+[Terraria Version]: https://img.shields.io/badge/Terraria-1.4.0.2-blue
+[Docker Stars]: https://img.shields.io/docker/stars/j123ss/tmodloader-docker.svg
+[Docker Pulls]: https://img.shields.io/docker/pulls/j123ss/tmodloader-docker.svg
+[default]: https://github.com/j123ss/tmodloader-docker-docker/blob/master/config.txt
 [directly]: https://github.com/tModLoader/tModLoader/wiki/Mod-Browser#direct-download
 [Environment Variables]: #environment-variables
-[game-manager]: https://hub.docker.com/r/rfvgyhn/game-manager/
-[0]: https://hub.docker.com/r/rfvgyhn/tmodloader
+[0]: https://hub.docker.com/r/j123ss/tmodloader-docker

From c01090caded08b92a18d2b2cb6e6ea9c3009f8f1 Mon Sep 17 00:00:00 2001
From: Joe Stratton <joe.stratton@asu.edu>
Date: Mon, 18 May 2020 09:17:36 -0700
Subject: [PATCH 12/19] fixed variable note- still needs tmodloader update to
 function

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4ae51b0..5ac7b74 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ WORKDIR /terraria-server
 
 RUN cp /usr/lib/libMonoPosixHelper.so .
 
-RUN curl -SLO "https://terraria.org/system/dedicated_servers/archives/000/000/036/original/terraria-server-${TMOD_VERSION}.zip" &&\
+RUN curl -SLO "https://terraria.org/system/dedicated_servers/archives/000/000/036/original/terraria-server-${TERRARIA_VERSION}.zip" &&\
     unzip terraria-server-*.zip &&\
     rm terraria-server-*.zip &&\
     cp --verbose -a "${TERRARIA_VERSION}/Linux/." . &&\

From 598548c58b07396068fa6d7ab27ec8f7d3948c46 Mon Sep 17 00:00:00 2001
From: Joe Stratton <joe.stratton@asu.edu>
Date: Mon, 18 May 2020 09:22:43 -0700
Subject: [PATCH 13/19] simplyfing travis pipeline

---
 ..travis.yml.un~ | Bin 0 -> 2414 bytes
 .travis.yml      |   9 +++------
 .travis.yml~     |  21 +++++++++++++++++++++
 3 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 ..travis.yml.un~
 create mode 100644 .travis.yml~

diff --git a/..travis.yml.un~ b/..travis.yml.un~
new file mode 100644
index 0000000000000000000000000000000000000000..6c4f9a81cb4b48e4e30b278a594e438040e5590c
GIT binary patch
literal 2414
zcmWH`%$*;a=aT=FfvJt_Munx<CN62K^G&5iPO(`6E8Gsv2%Yddz#%(pYWQph1_mJ@
zmRA4+U4`P3#Pn1vg`(0tg_Qi{?9?KK%v_)dPzgUs84xo9F)I**0EmWRhPXr9G+98h
zj12J?K(au<1fjqrNJ<dK{|^LUqhJD~G?haD7##xO=wM*@DgiWG0El714~hy4NR%rm
z=)z*Upfo2(LB+-2+1oWJJ~Y@h$j{N&Rlg)RKP4wWF(tJ~7m^}O8^O^FGJ_e2VE`1>
zAUjw<0;ACj3I$pMVDt(hM=vOQf`T6eKv5$Ai{9eoqRfI4D+Oq@fuac<MIePh0E$A8
zUT~HkjW$q_&=LTnO&B@a_<)vyf*%Ax(FTn*ctH%#lgK48G#WwC1}lX@dO=aj0mO<R
z&S*4(LV=b57>#ns(Z~+8j1!1Kbtxzs6(R8mkH)0Z%$yWhISZ~)q49{E6@mJ|aSE$x
jN8=F`A~XfSc+>#LBO|1e1Z781DGG~6LhT~c#^<X5z#V}n

literal 0
HcmV?d00001

diff --git a/.travis.yml b/.travis.yml
index 08d2e73..6439ce4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,17 +5,14 @@ services:
 
 jobs:
     include:
-      - stage: build docker image
+      - stage: Build and Push Docker Image
         script:
         - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
         - docker build -t tmodloader-docker .
         - docker images
         - docker tag tmodloader-docker $DOCKER_USERNAME/tmodloader-docker
         - docker push $DOCKER_USERNAME/tmodloader-docker
-      - stage: pull docker image
-        script: 
-        - docker pull $DOCKER_USERNAME/tmodloader-docker
-      - stage: run docker image
+      - stage: Run Docker Image
         script:
         - docker run -d --name Terraria -p 7777:7777 -v /etc/localtime:/etc/localtime:ro $DOCKER_USERNAME/tmodloader-docker
-        - docker ps -a
\ No newline at end of file
+        - docker ps -a
diff --git a/.travis.yml~ b/.travis.yml~
new file mode 100644
index 0000000..08d2e73
--- /dev/null
+++ b/.travis.yml~
@@ -0,0 +1,21 @@
+language: python
+
+services:
+  - docker
+
+jobs:
+    include:
+      - stage: build docker image
+        script:
+        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+        - docker build -t tmodloader-docker .
+        - docker images
+        - docker tag tmodloader-docker $DOCKER_USERNAME/tmodloader-docker
+        - docker push $DOCKER_USERNAME/tmodloader-docker
+      - stage: pull docker image
+        script: 
+        - docker pull $DOCKER_USERNAME/tmodloader-docker
+      - stage: run docker image
+        script:
+        - docker run -d --name Terraria -p 7777:7777 -v /etc/localtime:/etc/localtime:ro $DOCKER_USERNAME/tmodloader-docker
+        - docker ps -a
\ No newline at end of file

From c16fd8097f5ac38e1f35e76393091e1fb6f659e7 Mon Sep 17 00:00:00 2001
From: Joe Stratton <joe.stratton@asu.edu>
Date: Mon, 18 May 2020 09:23:08 -0700
Subject: [PATCH 14/19] simplyfing travis pipeline

---
 ..travis.yml.un~ | Bin 2414 -> 0 bytes
 .travis.yml~     |  21 ---------------------
 2 files changed, 21 deletions(-)
 delete mode 100644 ..travis.yml.un~
 delete mode 100644 .travis.yml~

diff --git a/..travis.yml.un~ b/..travis.yml.un~
deleted file mode 100644
index 6c4f9a81cb4b48e4e30b278a594e438040e5590c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2414
zcmWH`%$*;a=aT=FfvJt_Munx<CN62K^G&5iPO(`6E8Gsv2%Yddz#%(pYWQph1_mJ@
zmRA4+U4`P3#Pn1vg`(0tg_Qi{?9?KK%v_)dPzgUs84xo9F)I**0EmWRhPXr9G+98h
zj12J?K(au<1fjqrNJ<dK{|^LUqhJD~G?haD7##xO=wM*@DgiWG0El714~hy4NR%rm
z=)z*Upfo2(LB+-2+1oWJJ~Y@h$j{N&Rlg)RKP4wWF(tJ~7m^}O8^O^FGJ_e2VE`1>
zAUjw<0;ACj3I$pMVDt(hM=vOQf`T6eKv5$Ai{9eoqRfI4D+Oq@fuac<MIePh0E$A8
zUT~HkjW$q_&=LTnO&B@a_<)vyf*%Ax(FTn*ctH%#lgK48G#WwC1}lX@dO=aj0mO<R
z&S*4(LV=b57>#ns(Z~+8j1!1Kbtxzs6(R8mkH)0Z%$yWhISZ~)q49{E6@mJ|aSE$x
jN8=F`A~XfSc+>#LBO|1e1Z781DGG~6LhT~c#^<X5z#V}n

diff --git a/.travis.yml~ b/.travis.yml~
deleted file mode 100644
index 08d2e73..0000000
--- a/.travis.yml~
+++ /dev/null
@@ -1,21 +0,0 @@
-language: python
-
-services:
-  - docker
-
-jobs:
-    include:
-      - stage: build docker image
-        script:
-        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-        - docker build -t tmodloader-docker .
-        - docker images
-        - docker tag tmodloader-docker $DOCKER_USERNAME/tmodloader-docker
-        - docker push $DOCKER_USERNAME/tmodloader-docker
-      - stage: pull docker image
-        script: 
-        - docker pull $DOCKER_USERNAME/tmodloader-docker
-      - stage: run docker image
-        script:
-        - docker run -d --name Terraria -p 7777:7777 -v /etc/localtime:/etc/localtime:ro $DOCKER_USERNAME/tmodloader-docker
-        - docker ps -a
\ No newline at end of file

From 0c49a50954aed9035fa10b31f6306a11cd04bc82 Mon Sep 17 00:00:00 2001
From: Joe Stratton <Joe.Stratton@asu.edu>
Date: Mon, 18 May 2020 09:28:00 -0700
Subject: [PATCH 15/19] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1c68e22..abd63fc 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [tModLoader] dedicated server  
 
-Terraria server 1.4.0.2 with tModLoader v0.11.7.1
+Terraria server 1.4.0.2 with tModLoader v0.11.7.1 NOTE: This will not function until tmodloader is updated
 
 Supports graceful shutdown (saves when the container receives a stop command) and also supports autosaving every 10 minutes (configurable, see [Environment Variables] below).
 

From 61bc54cb9e4bcecfb9178d33c029c6e502da1fdb Mon Sep 17 00:00:00 2001
From: Joe Stratton <joe.stratton@asu.edu>
Date: Wed, 20 May 2020 07:48:10 -0700
Subject: [PATCH 16/19] cleanup before hibernating for tmod upates

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5ac7b74..b603637 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ RUN curl -SLO "https://terraria.org/system/dedicated_servers/archives/000/000/03
 RUN curl -SLO "https://github.com/tModLoader/tModLoader/releases/download/v${TMOD_VERSION}/tModLoader.Linux.v${TMOD_VERSION}.zip" &&\
     unzip -o tModLoader.Linux.v*.zip &&\
     rm tModLoader.Linux.v*.zip &&\
-    chmod u+x tModLoaderServer* tModLoaderServer.bin.*
+    chmod u+x tModLoaderServer* 
 
 FROM frolvlad/alpine-glibc:alpine-3.11
 

From f85553c629aea4bfd4f66323855aafaddd4cf34b Mon Sep 17 00:00:00 2001
From: Joe Stratton <joe.stratton@asu.edu>
Date: Mon, 8 Jun 2020 07:04:58 -0700
Subject: [PATCH 17/19] updating to working versions

---
 .Dockerfile.un~ | Bin 0 -> 1021 bytes
 .README.md.un~  | Bin 0 -> 2163 bytes
 Dockerfile      |   4 +--
 Dockerfile~     |  46 ++++++++++++++++++++++++++
 README.md       |   6 ++--
 README.md~      |  85 ++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 136 insertions(+), 5 deletions(-)
 create mode 100644 .Dockerfile.un~
 create mode 100644 .README.md.un~
 create mode 100644 Dockerfile~
 create mode 100644 README.md~

diff --git a/.Dockerfile.un~ b/.Dockerfile.un~
new file mode 100644
index 0000000000000000000000000000000000000000..8f1158ee7ab62ddabca657db49cca36c587606cd
GIT binary patch
literal 1021
zcmWH`%$*;a=aT=FfoYq8-sg`-a+7bb*dBh1byHBWs?e%wkJ1G%8Q%|`R~BZ@z`&pf
z#FCCd?g}BUK|zi|o{sThu0g?`{(iQGCI&`8NfwX-AZ7$&CLjg@5Dmi&ara#FSU|Fj
z4DlC0vOoY+2x5bzn1L8%2*ZCM0E>V)qksk>0E~_taC9&*e3by24~hy<9D*Vm6cv!j
z_VssxN3?;Sp`o6+o}p<YIQ~G2kO9nq(fC6S6`HYu@s|tDPT=?hWgS)^MvXsgnboxM
G`6>V`oIY3p

literal 0
HcmV?d00001

diff --git a/.README.md.un~ b/.README.md.un~
new file mode 100644
index 0000000000000000000000000000000000000000..d411abbcd72b5e0ff71d66ce194337d46a49d42e
GIT binary patch
literal 2163
zcmWH`%$*;a=aT=Ffhm_sIrLg|S5@@BmmgdWd;31_{x(C@_PedbZ^zSF%Vp9T7#Ko<
z7#T1EIV?~C5Dmi&ara!qSwOOk4DlDB3YefYhyqEm0<k!V^B)MnA|TEvpg{-#qeBTC
z9SjU#C4lCG;)xB2LGcNSimZ^-qN2p2%tVFa)S|M~A_YS|6FmbxBZczJk_?3s-~1Gx
z{KOQXc$tBop`o6+o}q%De~7D<LP$ntF;G!XjzV63i9%XwUUErhex5>UUP)$-LP>6Z
zN)ALHP*rI`N@7WBifJP_L4a&!24WZhB@TZeb_5BGCJ0a{&=LR>gduW*@B>;F0K~8a
z;T8=~5n-uC#lSd?wNl6^DJdwn($~+-P1h^V$V|;iDb~x(*H21JNl(>>sn>-j9o?jy
z(o|?<gCZAJOn`g^ig=KXRv^x3WP?J1mH-&p-pG;d3$zTB*I<!t9}UXk3PeUUNUbic
z7(k9?<m?Rc4y=#?u}5PW9164~fUz6~t#aXIJUh@rP%MKoAdWKLlm=xy$eUm{fU0<y
N8$cyKgK6XQRRH7ow_X4M

literal 0
HcmV?d00001

diff --git a/Dockerfile b/Dockerfile
index b603637..eb5de32 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM frolvlad/alpine-glibc:alpine-3.11 as build
 
-ARG TMOD_VERSION=0.11.7.1
-ARG TERRARIA_VERSION=1402
+ARG TMOD_VERSION=0.11.7.5
+ARG TERRARIA_VERSION=1405
 
 RUN apk update &&\
     apk add --no-cache --virtual build curl unzip &&\
diff --git a/Dockerfile~ b/Dockerfile~
new file mode 100644
index 0000000..b603637
--- /dev/null
+++ b/Dockerfile~
@@ -0,0 +1,46 @@
+FROM frolvlad/alpine-glibc:alpine-3.11 as build
+
+ARG TMOD_VERSION=0.11.7.1
+ARG TERRARIA_VERSION=1402
+
+RUN apk update &&\
+    apk add --no-cache --virtual build curl unzip &&\
+    apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing mono
+
+WORKDIR /terraria-server
+
+RUN cp /usr/lib/libMonoPosixHelper.so .
+
+RUN curl -SLO "https://terraria.org/system/dedicated_servers/archives/000/000/036/original/terraria-server-${TERRARIA_VERSION}.zip" &&\
+    unzip terraria-server-*.zip &&\
+    rm terraria-server-*.zip &&\
+    cp --verbose -a "${TERRARIA_VERSION}/Linux/." . &&\
+    rm -rf "${TERRARIA_VERSION}" &&\
+    rm TerrariaServer.bin.x86 TerrariaServer.exe
+
+RUN curl -SLO "https://github.com/tModLoader/tModLoader/releases/download/v${TMOD_VERSION}/tModLoader.Linux.v${TMOD_VERSION}.zip" &&\
+    unzip -o tModLoader.Linux.v*.zip &&\
+    rm tModLoader.Linux.v*.zip &&\
+    chmod u+x tModLoaderServer* 
+
+FROM frolvlad/alpine-glibc:alpine-3.11
+
+WORKDIR /terraria-server
+COPY --from=build /terraria-server ./
+
+RUN apk update &&\
+    apk add --no-cache procps tmux
+RUN ln -s ${HOME}/.local/share/Terraria/ /terraria
+COPY inject.sh /usr/local/bin/inject
+COPY handle-idle.sh /usr/local/bin/handle-idle
+
+EXPOSE 7777
+ENV TMOD_SHUTDOWN_MSG="Shutting down!"
+ENV TMOD_AUTOSAVE_INTERVAL="*/10 * * * *"
+ENV TMOD_IDLE_CHECK_INTERVAL=""
+ENV TMOD_IDLE_CHECK_OFFSET=0
+
+COPY config.txt entrypoint.sh ./
+RUN chmod +x entrypoint.sh /usr/local/bin/inject /usr/local/bin/handle-idle
+
+ENTRYPOINT [ "/terraria-server/entrypoint.sh" ]
diff --git a/README.md b/README.md
index abd63fc..48e9e09 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [tModLoader] dedicated server  
 
-Terraria server 1.4.0.2 with tModLoader v0.11.7.1 NOTE: This will not function until tmodloader is updated
+Terraria server 1.4.0.5 with tModLoader v0.11.7.5
 
 Supports graceful shutdown (saves when the container receives a stop command) and also supports autosaving every 10 minutes (configurable, see [Environment Variables] below).
 
@@ -75,8 +75,8 @@ TMOD_IDLE_CHECK_OFFSET   | 0              | This allows for sub-minute resolutio
 [tModLoader]: https://www.tmodloader.net/
 [wiki]: https://terraria.gamepedia.com/Server#Server_config_file
 [commands]: https://terraria.gamepedia.com/Server#List_of_console_commands
-[tMod Version]: https://img.shields.io/badge/tMod-0.11.7.1-blue
-[Terraria Version]: https://img.shields.io/badge/Terraria-1.4.0.2-blue
+[tMod Version]: https://img.shields.io/badge/tMod-0.11.7.5-blue
+[Terraria Version]: https://img.shields.io/badge/Terraria-1.4.0.5-blue
 [Docker Stars]: https://img.shields.io/docker/stars/j123ss/tmodloader-docker.svg
 [Docker Pulls]: https://img.shields.io/docker/pulls/j123ss/tmodloader-docker.svg
 [default]: https://github.com/j123ss/tmodloader-docker-docker/blob/master/config.txt
diff --git a/README.md~ b/README.md~
new file mode 100644
index 0000000..abd63fc
--- /dev/null
+++ b/README.md~
@@ -0,0 +1,85 @@
+# tModLoader Docker ![tMod Version] ![Terraria Version]  [![Docker Pulls]][0]
+
+[tModLoader] dedicated server  
+
+Terraria server 1.4.0.2 with tModLoader v0.11.7.1 NOTE: This will not function until tmodloader is updated
+
+Supports graceful shutdown (saves when the container receives a stop command) and also supports autosaving every 10 minutes (configurable, see [Environment Variables] below).
+
+## Quick Start
+
+    docker run -d --name tmod -p 7777:7777 -v /etc/localtime:/etc/localtime:ro j123ss/tmodloader-docker
+
+# Adding worlds
+
+    docker run -d --name tmod -p 7777:7777 -v /etc/localtime:/etc/localtime:ro -v $(pwd)/data:/terraria j123ss/tmodloader-docker
+
+# Server Config File
+
+You can mount a config file. This allows you to specify server and world settings. If you don't specify one, a [default] will be used. See [wiki] for file format details.
+
+    docker run -d --name tmod -p 7777:7777 -v /etc/localtime:/etc/localtime:ro -v $(pwd)/data:/terraria -v $(pwd)/config.txt:/terraria-server/config.txt j123ss/tmodloader-docker
+
+# Initial Setup
+
+If you want to use the server's mod browser to install and enable mods, run an interactive container with the `setup` parameter appended to the end.
+
+    docker run -it --rm -v $(pwd)/data:/terraria j123ss/tmodloader-docker setup
+
+After setting up your mods, and optionally setting up a world, press `Ctrl+C` to exit the container. Then you can use the normal docker command to run your server. Note that you'll see the mods and the `enabled.json` files appear in your mods folder on the host.
+
+You can also skip this step and [directly] download your mods. Place the mod files in your `data/ModLoader/Mods` folder and make sure to enable them in the `data/ModLoader/Mods/enabled.json` file.
+
+# Sending Commands to the Server
+
+This container is designed to be run in headless mode. This means you you can't manually type [commands] like you would on a normal Terraria server.
+You can inject [commands] from the host machine though. For example, assuming your container is named _tmod_:
+
+    docker exec tmod inject "kick player1"
+    docker exec tmod inject "say NOT THE BEEES!!!"
+
+# Environment Variables
+
+Name                     | Default Value  | |
+-------------------------|----------------|-
+TMOD_SHUTDOWN_MSG        | Shutting Down! | Message that appears when server is shutting down
+TMOD_AUTOSAVE_INTERVAL   | */10 * * * *   | Cron expression that specifies how often to save the world. Default is every 10 minutes.
+TMOD_IDLE_CHECK_INTERVAL | Disabled       | Cron expression that specifies how often to check if no players are online. If none are online, the server will save the world and exit. This can be useful if your server costs are based on CPU usage. Pairs well with [game-manager].
+TMOD_IDLE_CHECK_OFFSET   | 0              | This allows for sub-minute resolution if the idle check interval is specified
+
+    docker run -d --name tmod \
+               -e TMOD_SHUTDOWN_MSG="Goodbye" \
+               -e TMOD_AUTOSAVE_INTERVAL="*/15 * * * *" \
+               -e TMOD_IDLE_CHECK_INTERVAL="*/1 * * * *" \
+               -e TMOD_IDLE_CHECK_OFFSET=10 \
+               -p 7777:7777 \
+               -v /etc/localtime:/etc/localtime:ro \
+               j123ss/tmodloader-docker
+
+# Sample Docker Compose
+
+    version: '3'
+    services:
+        tmod:
+            image: 'j123ss/tmodloader-docker:latest'
+            container_name: 'tmod'
+            ports:
+                - '7777:7777'
+            volumes:
+                - /etc/localtime:/etc/localtime:ro
+                - ./data:/terraria
+                - ./config.txt:/terraria-server/config.txt
+            environment:
+                - TMOD_SHUTDOWN_MSG="See ya!"
+
+[tModLoader]: https://www.tmodloader.net/
+[wiki]: https://terraria.gamepedia.com/Server#Server_config_file
+[commands]: https://terraria.gamepedia.com/Server#List_of_console_commands
+[tMod Version]: https://img.shields.io/badge/tMod-0.11.7.1-blue
+[Terraria Version]: https://img.shields.io/badge/Terraria-1.4.0.2-blue
+[Docker Stars]: https://img.shields.io/docker/stars/j123ss/tmodloader-docker.svg
+[Docker Pulls]: https://img.shields.io/docker/pulls/j123ss/tmodloader-docker.svg
+[default]: https://github.com/j123ss/tmodloader-docker-docker/blob/master/config.txt
+[directly]: https://github.com/tModLoader/tModLoader/wiki/Mod-Browser#direct-download
+[Environment Variables]: #environment-variables
+[0]: https://hub.docker.com/r/j123ss/tmodloader-docker

From 7e6e4e5ea8c6a0c024e485950205df55952a7759 Mon Sep 17 00:00:00 2001
From: Joe Stratton <joe.stratton@asu.edu>
Date: Mon, 8 Jun 2020 07:05:45 -0700
Subject: [PATCH 18/19] updating to working versions

---
 .Dockerfile.un~ | Bin 1021 -> 0 bytes
 .README.md.un~  | Bin 2163 -> 0 bytes
 Dockerfile~     |  46 --------------------------
 README.md~      |  85 ------------------------------------------------
 4 files changed, 131 deletions(-)
 delete mode 100644 .Dockerfile.un~
 delete mode 100644 .README.md.un~
 delete mode 100644 Dockerfile~
 delete mode 100644 README.md~

diff --git a/.Dockerfile.un~ b/.Dockerfile.un~
deleted file mode 100644
index 8f1158ee7ab62ddabca657db49cca36c587606cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1021
zcmWH`%$*;a=aT=FfoYq8-sg`-a+7bb*dBh1byHBWs?e%wkJ1G%8Q%|`R~BZ@z`&pf
z#FCCd?g}BUK|zi|o{sThu0g?`{(iQGCI&`8NfwX-AZ7$&CLjg@5Dmi&ara#FSU|Fj
z4DlC0vOoY+2x5bzn1L8%2*ZCM0E>V)qksk>0E~_taC9&*e3by24~hy<9D*Vm6cv!j
z_VssxN3?;Sp`o6+o}p<YIQ~G2kO9nq(fC6S6`HYu@s|tDPT=?hWgS)^MvXsgnboxM
G`6>V`oIY3p

diff --git a/.README.md.un~ b/.README.md.un~
deleted file mode 100644
index d411abbcd72b5e0ff71d66ce194337d46a49d42e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2163
zcmWH`%$*;a=aT=Ffhm_sIrLg|S5@@BmmgdWd;31_{x(C@_PedbZ^zSF%Vp9T7#Ko<
z7#T1EIV?~C5Dmi&ara!qSwOOk4DlDB3YefYhyqEm0<k!V^B)MnA|TEvpg{-#qeBTC
z9SjU#C4lCG;)xB2LGcNSimZ^-qN2p2%tVFa)S|M~A_YS|6FmbxBZczJk_?3s-~1Gx
z{KOQXc$tBop`o6+o}q%De~7D<LP$ntF;G!XjzV63i9%XwUUErhex5>UUP)$-LP>6Z
zN)ALHP*rI`N@7WBifJP_L4a&!24WZhB@TZeb_5BGCJ0a{&=LR>gduW*@B>;F0K~8a
z;T8=~5n-uC#lSd?wNl6^DJdwn($~+-P1h^V$V|;iDb~x(*H21JNl(>>sn>-j9o?jy
z(o|?<gCZAJOn`g^ig=KXRv^x3WP?J1mH-&p-pG;d3$zTB*I<!t9}UXk3PeUUNUbic
z7(k9?<m?Rc4y=#?u}5PW9164~fUz6~t#aXIJUh@rP%MKoAdWKLlm=xy$eUm{fU0<y
N8$cyKgK6XQRRH7ow_X4M

diff --git a/Dockerfile~ b/Dockerfile~
deleted file mode 100644
index b603637..0000000
--- a/Dockerfile~
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM frolvlad/alpine-glibc:alpine-3.11 as build
-
-ARG TMOD_VERSION=0.11.7.1
-ARG TERRARIA_VERSION=1402
-
-RUN apk update &&\
-    apk add --no-cache --virtual build curl unzip &&\
-    apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing mono
-
-WORKDIR /terraria-server
-
-RUN cp /usr/lib/libMonoPosixHelper.so .
-
-RUN curl -SLO "https://terraria.org/system/dedicated_servers/archives/000/000/036/original/terraria-server-${TERRARIA_VERSION}.zip" &&\
-    unzip terraria-server-*.zip &&\
-    rm terraria-server-*.zip &&\
-    cp --verbose -a "${TERRARIA_VERSION}/Linux/." . &&\
-    rm -rf "${TERRARIA_VERSION}" &&\
-    rm TerrariaServer.bin.x86 TerrariaServer.exe
-
-RUN curl -SLO "https://github.com/tModLoader/tModLoader/releases/download/v${TMOD_VERSION}/tModLoader.Linux.v${TMOD_VERSION}.zip" &&\
-    unzip -o tModLoader.Linux.v*.zip &&\
-    rm tModLoader.Linux.v*.zip &&\
-    chmod u+x tModLoaderServer* 
-
-FROM frolvlad/alpine-glibc:alpine-3.11
-
-WORKDIR /terraria-server
-COPY --from=build /terraria-server ./
-
-RUN apk update &&\
-    apk add --no-cache procps tmux
-RUN ln -s ${HOME}/.local/share/Terraria/ /terraria
-COPY inject.sh /usr/local/bin/inject
-COPY handle-idle.sh /usr/local/bin/handle-idle
-
-EXPOSE 7777
-ENV TMOD_SHUTDOWN_MSG="Shutting down!"
-ENV TMOD_AUTOSAVE_INTERVAL="*/10 * * * *"
-ENV TMOD_IDLE_CHECK_INTERVAL=""
-ENV TMOD_IDLE_CHECK_OFFSET=0
-
-COPY config.txt entrypoint.sh ./
-RUN chmod +x entrypoint.sh /usr/local/bin/inject /usr/local/bin/handle-idle
-
-ENTRYPOINT [ "/terraria-server/entrypoint.sh" ]
diff --git a/README.md~ b/README.md~
deleted file mode 100644
index abd63fc..0000000
--- a/README.md~
+++ /dev/null
@@ -1,85 +0,0 @@
-# tModLoader Docker ![tMod Version] ![Terraria Version]  [![Docker Pulls]][0]
-
-[tModLoader] dedicated server  
-
-Terraria server 1.4.0.2 with tModLoader v0.11.7.1 NOTE: This will not function until tmodloader is updated
-
-Supports graceful shutdown (saves when the container receives a stop command) and also supports autosaving every 10 minutes (configurable, see [Environment Variables] below).
-
-## Quick Start
-
-    docker run -d --name tmod -p 7777:7777 -v /etc/localtime:/etc/localtime:ro j123ss/tmodloader-docker
-
-# Adding worlds
-
-    docker run -d --name tmod -p 7777:7777 -v /etc/localtime:/etc/localtime:ro -v $(pwd)/data:/terraria j123ss/tmodloader-docker
-
-# Server Config File
-
-You can mount a config file. This allows you to specify server and world settings. If you don't specify one, a [default] will be used. See [wiki] for file format details.
-
-    docker run -d --name tmod -p 7777:7777 -v /etc/localtime:/etc/localtime:ro -v $(pwd)/data:/terraria -v $(pwd)/config.txt:/terraria-server/config.txt j123ss/tmodloader-docker
-
-# Initial Setup
-
-If you want to use the server's mod browser to install and enable mods, run an interactive container with the `setup` parameter appended to the end.
-
-    docker run -it --rm -v $(pwd)/data:/terraria j123ss/tmodloader-docker setup
-
-After setting up your mods, and optionally setting up a world, press `Ctrl+C` to exit the container. Then you can use the normal docker command to run your server. Note that you'll see the mods and the `enabled.json` files appear in your mods folder on the host.
-
-You can also skip this step and [directly] download your mods. Place the mod files in your `data/ModLoader/Mods` folder and make sure to enable them in the `data/ModLoader/Mods/enabled.json` file.
-
-# Sending Commands to the Server
-
-This container is designed to be run in headless mode. This means you you can't manually type [commands] like you would on a normal Terraria server.
-You can inject [commands] from the host machine though. For example, assuming your container is named _tmod_:
-
-    docker exec tmod inject "kick player1"
-    docker exec tmod inject "say NOT THE BEEES!!!"
-
-# Environment Variables
-
-Name                     | Default Value  | |
--------------------------|----------------|-
-TMOD_SHUTDOWN_MSG        | Shutting Down! | Message that appears when server is shutting down
-TMOD_AUTOSAVE_INTERVAL   | */10 * * * *   | Cron expression that specifies how often to save the world. Default is every 10 minutes.
-TMOD_IDLE_CHECK_INTERVAL | Disabled       | Cron expression that specifies how often to check if no players are online. If none are online, the server will save the world and exit. This can be useful if your server costs are based on CPU usage. Pairs well with [game-manager].
-TMOD_IDLE_CHECK_OFFSET   | 0              | This allows for sub-minute resolution if the idle check interval is specified
-
-    docker run -d --name tmod \
-               -e TMOD_SHUTDOWN_MSG="Goodbye" \
-               -e TMOD_AUTOSAVE_INTERVAL="*/15 * * * *" \
-               -e TMOD_IDLE_CHECK_INTERVAL="*/1 * * * *" \
-               -e TMOD_IDLE_CHECK_OFFSET=10 \
-               -p 7777:7777 \
-               -v /etc/localtime:/etc/localtime:ro \
-               j123ss/tmodloader-docker
-
-# Sample Docker Compose
-
-    version: '3'
-    services:
-        tmod:
-            image: 'j123ss/tmodloader-docker:latest'
-            container_name: 'tmod'
-            ports:
-                - '7777:7777'
-            volumes:
-                - /etc/localtime:/etc/localtime:ro
-                - ./data:/terraria
-                - ./config.txt:/terraria-server/config.txt
-            environment:
-                - TMOD_SHUTDOWN_MSG="See ya!"
-
-[tModLoader]: https://www.tmodloader.net/
-[wiki]: https://terraria.gamepedia.com/Server#Server_config_file
-[commands]: https://terraria.gamepedia.com/Server#List_of_console_commands
-[tMod Version]: https://img.shields.io/badge/tMod-0.11.7.1-blue
-[Terraria Version]: https://img.shields.io/badge/Terraria-1.4.0.2-blue
-[Docker Stars]: https://img.shields.io/docker/stars/j123ss/tmodloader-docker.svg
-[Docker Pulls]: https://img.shields.io/docker/pulls/j123ss/tmodloader-docker.svg
-[default]: https://github.com/j123ss/tmodloader-docker-docker/blob/master/config.txt
-[directly]: https://github.com/tModLoader/tModLoader/wiki/Mod-Browser#direct-download
-[Environment Variables]: #environment-variables
-[0]: https://hub.docker.com/r/j123ss/tmodloader-docker

From 7b799efb4a890c4d6ff7366a5308191d3bcc0b9f Mon Sep 17 00:00:00 2001
From: Joe Stratton <joe.stratton@asu.edu>
Date: Mon, 8 Jun 2020 07:10:51 -0700
Subject: [PATCH 19/19] updating to working versions

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index eb5de32..6574837 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ WORKDIR /terraria-server
 
 RUN cp /usr/lib/libMonoPosixHelper.so .
 
-RUN curl -SLO "https://terraria.org/system/dedicated_servers/archives/000/000/036/original/terraria-server-${TERRARIA_VERSION}.zip" &&\
+RUN curl -SLO "https://www.terraria.org/system/dedicated_servers/archives/000/000/039/original/terraria-server-${TERRARIA_VERSION}.zip" &&\
     unzip terraria-server-*.zip &&\
     rm terraria-server-*.zip &&\
     cp --verbose -a "${TERRARIA_VERSION}/Linux/." . &&\