From 315d839a7848058f19a0a4c4c09b686438d230c9 Mon Sep 17 00:00:00 2001
From: agp8x <git@agp8x.org>
Date: Mon, 12 Oct 2020 13:21:18 +0200
Subject: [PATCH] update base image, add cron

---
 conf/overviewer.conf  | 41 +++++++++++++++++++++++++++++++++++------
 docker-compose.yml    |  2 +-
 overviewer/Dockerfile | 24 +++++++++++++++---------
 overviewer/cron.sh    |  4 ++++
 4 files changed, 55 insertions(+), 16 deletions(-)
 create mode 100644 overviewer/cron.sh

diff --git a/conf/overviewer.conf b/conf/overviewer.conf
index 81399ee..7360675 100644
--- a/conf/overviewer.conf
+++ b/conf/overviewer.conf
@@ -1,20 +1,49 @@
-worlds["agp8x's test welt"] = "/world/"
+worlds["survival"] = "/world/"
+
+world = "survival"
+
+outputdir = "/overview/"
+
+texturepath = "/textures/1.16.3.jar"
 
 renders["normalrender"] = {
-    "world": "agp8x's test welt",
     "title": "Normal Render of My World",
 }
 renders["smoothrender"] = {
-    "world": "agp8x's test welt",
     "title": "smooth Render of My World",
     "rendermode": "smooth_lighting"
 }
 renders["night"] = {
-    "world": "agp8x's test welt",
     "title": "night Render of My World",
     "rendermode": "night"
 }
 
-outputdir = "/overview/"
+renders["underground2"] = {
+    "title": "Underground2 Render",
+    "rendermode": [Base(), Depth(min=0, max=7)],
+    "dimension": "overworld"
+}
+renders["nether"] = {
+    "title": "Nether Smooth Render",
+    "rendermode": "nether_smooth_lighting",
+    "dimension": "nether"
+}
 
-texturepath = "/textures/1.15.2.jar"
+renders['biomeover'] = {
+    'rendermode': [ClearBase(), BiomeOverlay()],
+    'title': "Biome Coloring Overlay",
+    'overlay': ['normalrender', 'smoothrender', 'night']
+}
+renders['mineralover'] = {
+    'rendermode': [ClearBase(), MineralOverlay(minerals=[(64,(255,255,0)), (13,(127,0,127))])
+],
+    'title': "Mineral Coloring Overlay",
+    'overlay': ['normalrender', 'smoothrender', 'night']
+}
+
+from .observer import MultiplexingObserver, LoggingObserver, JSObserver, RConObserver
+loggingObserver = LoggingObserver()
+jsObserver = JSObserver(outputdir=outputdir, minrefresh=10)
+rconObserver = RConObserver(target="minecraft", password="minecraft")
+observer = MultiplexingObserver(loggingObserver, jsObserver, rconObserver)
+#observer = MultiplexingObserver(loggingObserver, jsObserver)
diff --git a/docker-compose.yml b/docker-compose.yml
index 6f1729d..78a449e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,7 @@ services:
    - ./data/minecraft:/data
    - ./data/minecraft_mods:/mods
  overviewer:
-  image: docker.clkl.de/minecraft/overviewer:0.15
+  image: docker.clkl.de/minecraft/overviewer:0.16
   build: overviewer
   volumes:
    - ./conf/overviewer.conf:/overviewer.conf
diff --git a/overviewer/Dockerfile b/overviewer/Dockerfile
index 5943aee..6c9caab 100644
--- a/overviewer/Dockerfile
+++ b/overviewer/Dockerfile
@@ -1,10 +1,16 @@
-FROM alpine:3.11
-RUN apk update && apk add git build-base python3-dev zlib-dev jpeg-dev py3-numpy-dev && \
-	apk add python3 py3-numpy zlib jpeg && pip3 install pillow==7.0.0 && \
-	wget https://github.com/python-pillow/Pillow/archive/7.0.0.tar.gz -O /pillow.tgz && tar -xzf /pillow.tgz && \
-	wget https://github.com/overviewer/Minecraft-Overviewer/archive/v0.15.0.tar.gz -O ov.tgz && tar -xzf ov.tgz && \
-	cd /Minecraft-Overviewer-0.15.0/ && \
-	PIL_INCLUDE_DIR=/Pillow-7.0.0/src/libImaging/ python3 setup.py build && \
-	rm -rf /Pillow-7.0.0 && apk del git build-base python3-dev zlib-dev jpeg-dev py3-numpy-dev
+FROM alpine:3.12
 
-CMD ["/Minecraft-Overviewer-0.15.0/overviewer.py", "--config", "/overviewer.conf"]
+# install pillow form instead of py3-pillow to use the source (no -dev package available)
+
+RUN apk update && apk add git build-base python3-dev zlib-dev jpeg-dev py3-numpy-dev && \
+	apk add python3 py3-pip py3-numpy zlib jpeg && pip3 install pillow==7.2.0 && \
+	wget https://github.com/python-pillow/Pillow/archive/7.2.0.tar.gz -O /pillow.tgz && tar -xzf /pillow.tgz && \
+	wget https://github.com/overviewer/Minecraft-Overviewer/archive/v0.16.0.tar.gz -O ov.tgz && tar -xzf ov.tgz && \
+	cd /Minecraft-Overviewer-0.16.0/ && \
+	PIL_INCLUDE_DIR=/Pillow-7.2.0/src/libImaging/ python3 setup.py build && \
+	rm -rf /Pillow-7.2.0 && apk del git build-base python3-dev zlib-dev jpeg-dev py3-numpy-dev && \
+	echo '0 * * * * /Minecraft-Overviewer-0.16.0/overviewer.py --config /overviewer.conf' > /var/spool/cron/crontabs/root
+
+COPY cron.sh /
+
+CMD ["sh", "/cron.sh"]
diff --git a/overviewer/cron.sh b/overviewer/cron.sh
new file mode 100644
index 0000000..4dfa411
--- /dev/null
+++ b/overviewer/cron.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -eu
+
+exec busybox crond -f -l 0 -L /dev/stdout