From 03c1f549b72da16257f0c594c54d64134e8b27f2 Mon Sep 17 00:00:00 2001
From: Mitchell Skaggs <skaggsm333@gmail.com>
Date: Tue, 7 Apr 2020 22:45:30 -0500
Subject: [PATCH 1/5] Move quotes to surround entire path

Co-Authored-By: Mark Ide <546518+mide@users.noreply.github.com>
---
 entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 28a254f..be8028d 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -10,7 +10,7 @@ fi
 # Download Minecraft client .jar (Contains textures used by Minecraft Overviewer)
 CLIENT_URL=$(python3 /home/minecraft/download_url.py "$MINECRAFT_VERSION")
 echo "Using Client URL $CLIENT_URL."
-wget -N "${CLIENT_URL}" -O "${MINECRAFT_VERSION}.jar" -P /home/minecraft/.minecraft/versions/${MINECRAFT_VERSION}/
+wget -N "${CLIENT_URL}" -O "${MINECRAFT_VERSION}.jar" -P "/home/minecraft/.minecraft/versions/${MINECRAFT_VERSION}/"
 
 # Render the Map
 if [ "$RENDER_MAP" == "true" ]; then

From c48473b1506d25b0224b52bb098ba63e57da228d Mon Sep 17 00:00:00 2001
From: Mitchell Skaggs <skaggsm333@gmail.com>
Date: Tue, 7 Apr 2020 22:47:08 -0500
Subject: [PATCH 2/5] Disable shellcheck warnings when we actually want to
 split/glob arguments

See the last note here: https://github.com/koalaman/shellcheck/wiki/SC2086

> As always, this warning can be ignored on a case-by-case basis.
> This is especially relevant when BASH may not be available for the array work around. For example, use in eval or in command options where script has total control of the variables...
---
 entrypoint.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/entrypoint.sh b/entrypoint.sh
index be8028d..e51524a 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -14,10 +14,12 @@ wget -N "${CLIENT_URL}" -O "${MINECRAFT_VERSION}.jar" -P "/home/minecraft/.minec
 
 # Render the Map
 if [ "$RENDER_MAP" == "true" ]; then
+  # shellcheck disable=SC2086
   overviewer.py --config "$CONFIG_LOCATION" $ADDITIONAL_ARGS
 fi
 
 # Render the POI
 if [ "$RENDER_POI" == "true" ]; then
+  # shellcheck disable=SC2086
   overviewer.py --config "$CONFIG_LOCATION" --genpoi $ADDITIONAL_ARGS_POI
 fi

From 024958b463bca5cec68fbe3d048e90b926325c01 Mon Sep 17 00:00:00 2001
From: Mitchell Skaggs <skaggsm333@gmail.com>
Date: Wed, 8 Apr 2020 17:36:15 -0500
Subject: [PATCH 3/5] Use minimal language in Travis CI to speed up build

We don't use any Ruby stuff (the default for historic reasons), so we explicitly disable it.
---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 88b368f..b020798 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+language: minimal
+
 services:
   - docker
 

From c46a74beac4342fcc7c002ad611a6c7f19b8e2ef Mon Sep 17 00:00:00 2001
From: Mitchell Skaggs <skaggsm333@gmail.com>
Date: Wed, 8 Apr 2020 17:42:03 -0500
Subject: [PATCH 4/5] Remove cache deletion as the Debian parent image handles
 it automatically

See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run
---
 Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a8f9a81..0b1a87f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,9 +30,7 @@ RUN apt-get update && \
     echo "deb http://overviewer.org/debian ./" >> /etc/apt/sources.list && \
     wget -O - https://overviewer.org/debian/overviewer.gpg.asc | apt-key add - && \
     apt-get update && \
-    apt-get install -y minecraft-overviewer && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
+    apt-get install -y --no-install-recommends minecraft-overviewer && \
     useradd -m minecraft && \
     mkdir -p /home/minecraft/render /home/minecraft/server
 

From 467df6b3e5abec86b2998a5a4fb105694ffa1f2f Mon Sep 17 00:00:00 2001
From: Mark Ide <546518+mide@users.noreply.github.com>
Date: Sun, 7 Jun 2020 18:24:18 -0400
Subject: [PATCH 5/5] Update Dockerfile

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

diff --git a/Dockerfile b/Dockerfile
index 0b1a87f..f3d133c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,6 +31,7 @@ RUN apt-get update && \
     wget -O - https://overviewer.org/debian/overviewer.gpg.asc | apt-key add - && \
     apt-get update && \
     apt-get install -y --no-install-recommends minecraft-overviewer && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
     useradd -m minecraft && \
     mkdir -p /home/minecraft/render /home/minecraft/server