From 907c780aabe9eec558e4d03b08bd733f3b457091 Mon Sep 17 00:00:00 2001
From: Andrew Coleman <penguincoder@gmail.com>
Date: Mon, 12 Jun 2017 16:34:57 -0400
Subject: [PATCH] use make based overviewer

---
 overviewer/Dockerfile        | 19 ++++++++++---------
 overviewer/Makefile          | 14 ++++++++++++++
 overviewer/run-overviewer.sh |  3 +--
 3 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 overviewer/Makefile

diff --git a/overviewer/Dockerfile b/overviewer/Dockerfile
index 197c1b7..a1c6a10 100644
--- a/overviewer/Dockerfile
+++ b/overviewer/Dockerfile
@@ -3,11 +3,7 @@ MAINTAINER Andrew Coleman <penguincoder@gmail.com>
 
 RUN apt-get update && \
     apt-get upgrade -y && \
-    apt-get install -y apt-transport-https apt-utils cron gettext-base lsb-release wget && \
-    echo "deb https://overviewer.org/debian ./" > /etc/apt/sources.list.d/overviewer.list && \
-    wget -q -O - https://overviewer.org/debian/overviewer.gpg.asc | apt-key add - && \
-    apt-get update && \
-    apt-get install -y minecraft-overviewer && \
+    apt-get install -y apt-transport-https apt-utils git build-essential python-imaging python-dev python-numpy rsync wget && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
     useradd --create-home --uid 1000 --gid 100 notch
@@ -15,9 +11,14 @@ RUN apt-get update && \
 USER notch
 ENV MINECRAFT_VERSION 1.11
 RUN mkdir -p /home/notch/.minecraft/versions/${MINECRAFT_VERSION} && \
-    wget -q -P /home/notch/.minecraft/versions/${MINECRAFT_VERSION} https://s3.amazonaws.com/Minecraft.Download/versions/${MINECRAFT_VERSION}/${MINECRAFT_VERSION}.jar
+    wget -q -P /home/notch/.minecraft/versions/${MINECRAFT_VERSION} https://s3.amazonaws.com/Minecraft.Download/versions/${MINECRAFT_VERSION}/${MINECRAFT_VERSION}.jar && \
+    git clone git://github.com/overviewer/Minecraft-Overviewer.git /home/notch/overviewer && \
+    cd /home/notch/overviewer && \
+    git checkout leaflet && \
+    python2 setup.py build
 VOLUME /map
 VOLUME /data
-ADD config.py /
-ADD run-overviewer.sh /
-CMD /run-overviewer.sh 15m
+WORKDIR /home/notch
+ADD config.py /home/notch/
+ADD run-overviewer.sh /home/notch
+CMD /home/notch/run-overviewer.sh 1h
diff --git a/overviewer/Makefile b/overviewer/Makefile
new file mode 100644
index 0000000..358bdc2
--- /dev/null
+++ b/overviewer/Makefile
@@ -0,0 +1,14 @@
+.PHONY: all clean
+
+all:
+	docker build -t overviewer . && \
+	docker run \
+		--detach \
+		--restart always \
+		--name overviewer \
+		--volume $(MC_HOME)/minecraft/:/data \
+		--volume $(MC_HOME)/overviewer/:/map \
+		overviewer
+
+clean:
+	docker ps -a | grep overviewer && docker rm -f -v overviewer || true
diff --git a/overviewer/run-overviewer.sh b/overviewer/run-overviewer.sh
index 925b655..3d19e79 100755
--- a/overviewer/run-overviewer.sh
+++ b/overviewer/run-overviewer.sh
@@ -3,8 +3,7 @@
 SLEEP=${1}
 
 function update_map() {
-  overviewer.py --config=/config.py --check-tiles
-  sed -i "s/sensor=false/key=${GOOGLE_MAPS_API_KEY}\&sensor=false/" /map/index.html
+  nice -n 19 overviewer/overviewer.py --config=config.py
 }
 
 update_map