Compare commits
No commits in common. "7582c9853f7f029da3fc2237a07905cf2da4f92b" and "3ffd3ebc2ce3e78412ee06cf81e681ced335de9b" have entirely different histories.
7582c9853f
...
3ffd3ebc2c
|
|
@ -1,51 +1,20 @@
|
||||||
from os import getenv
|
worlds["agp8x's test welt"] = "/world/"
|
||||||
|
|
||||||
worlds["survival"] = "/world/"
|
|
||||||
|
|
||||||
world = "survival"
|
|
||||||
|
|
||||||
outputdir = "/overview/"
|
|
||||||
|
|
||||||
texturepath = "/textures/1.16.3.jar"
|
|
||||||
|
|
||||||
renders["normalrender"] = {
|
renders["normalrender"] = {
|
||||||
|
"world": "agp8x's test welt",
|
||||||
"title": "Normal Render of My World",
|
"title": "Normal Render of My World",
|
||||||
}
|
}
|
||||||
renders["smoothrender"] = {
|
renders["smoothrender"] = {
|
||||||
|
"world": "agp8x's test welt",
|
||||||
"title": "smooth Render of My World",
|
"title": "smooth Render of My World",
|
||||||
"rendermode": "smooth_lighting"
|
"rendermode": "smooth_lighting"
|
||||||
}
|
}
|
||||||
renders["night"] = {
|
renders["night"] = {
|
||||||
|
"world": "agp8x's test welt",
|
||||||
"title": "night Render of My World",
|
"title": "night Render of My World",
|
||||||
"rendermode": "night"
|
"rendermode": "night"
|
||||||
}
|
}
|
||||||
|
|
||||||
renders["underground2"] = {
|
outputdir = "/overview/"
|
||||||
"title": "Underground2 Render",
|
|
||||||
"rendermode": [Base(), Depth(min=0, max=7)],
|
|
||||||
"dimension": "overworld"
|
|
||||||
}
|
|
||||||
renders["nether"] = {
|
|
||||||
"title": "Nether Smooth Render",
|
|
||||||
"rendermode": "nether_smooth_lighting",
|
|
||||||
"dimension": "nether"
|
|
||||||
}
|
|
||||||
|
|
||||||
renders['biomeover'] = {
|
texturepath = "/textures/1.15.2.jar"
|
||||||
'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=getenv("RCON_PASSWORD", "minecraft"))
|
|
||||||
observer = MultiplexingObserver(loggingObserver, jsObserver, rconObserver)
|
|
||||||
#observer = MultiplexingObserver(loggingObserver, jsObserver)
|
|
||||||
|
|
|
||||||
|
|
@ -14,10 +14,8 @@ services:
|
||||||
- ./data/minecraft:/data
|
- ./data/minecraft:/data
|
||||||
- ./data/minecraft_mods:/mods
|
- ./data/minecraft_mods:/mods
|
||||||
overviewer:
|
overviewer:
|
||||||
image: docker.clkl.de/minecraft/overviewer:0.16
|
image: docker.clkl.de/minecraft/overviewer:0.15
|
||||||
build: overviewer
|
build: overviewer
|
||||||
env_file:
|
|
||||||
- ./docker.env
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./conf/overviewer.conf:/overviewer.conf
|
- ./conf/overviewer.conf:/overviewer.conf
|
||||||
- ./data/minecraft/world:/world/
|
- ./data/minecraft/world:/world/
|
||||||
|
|
@ -27,18 +25,5 @@ services:
|
||||||
image: nginx:alpine
|
image: nginx:alpine
|
||||||
volumes:
|
volumes:
|
||||||
- ./data/overview/:/usr/share/nginx/html
|
- ./data/overview/:/usr/share/nginx/html
|
||||||
networks:
|
ports:
|
||||||
- default
|
- "8888:80"
|
||||||
- frontend
|
|
||||||
labels:
|
|
||||||
- "traefik.enable=true"
|
|
||||||
- "traefik.docker.network=frontend_frontend"
|
|
||||||
- "traefik.port=80"
|
|
||||||
- "traefik.frontend.rule=Host:mc.kinf.wiai.uni-bamberg.de,mc.wie-ei.de"
|
|
||||||
|
|
||||||
networks:
|
|
||||||
frontend:
|
|
||||||
external:
|
|
||||||
name: frontend_frontend
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
EULA=TRUE
|
|
||||||
TZ=Europe/Berlin
|
|
||||||
WHITELIST=agp8x
|
|
||||||
OPS=agp8x
|
|
||||||
SERVER_NAME=KinfCraft
|
|
||||||
MAX_PLAYERS=50
|
|
||||||
SNOOPER_ENABLED=false
|
|
||||||
MOTD=providing fun for kinf!
|
|
||||||
RCON_PASSWORD=minecraft@kinf
|
|
||||||
|
|
@ -1,23 +1,10 @@
|
||||||
FROM alpine:3.12
|
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
|
||||||
|
|
||||||
# install pillow form instead of py3-pillow to use the source (no -dev package available)
|
CMD ["/Minecraft-Overviewer-0.15.0/overviewer.py", "--config", "/overviewer.conf"]
|
||||||
|
|
||||||
ENV PILLOW=7.2.0
|
|
||||||
ENV OVERVIEWER=0.16.0
|
|
||||||
|
|
||||||
RUN apk update && apk add git build-base python3-dev zlib-dev jpeg-dev py3-numpy-dev tzdata alpine-conf && \
|
|
||||||
apk add python3 py3-pip py3-numpy zlib jpeg && pip3 install pillow==${PILLOW} && \
|
|
||||||
wget https://github.com/python-pillow/Pillow/archive/${PILLOW}.tar.gz -O /pillow.tgz && tar -xzf /pillow.tgz && \
|
|
||||||
wget https://github.com/overviewer/Minecraft-Overviewer/archive/v${OVERVIEWER}.tar.gz -O ov.tgz && tar -xzf ov.tgz && \
|
|
||||||
cd /Minecraft-Overviewer-${OVERVIEWER}/ && \
|
|
||||||
PIL_INCLUDE_DIR=/Pillow-${PILLOW}/src/libImaging/ python3 setup.py build && \
|
|
||||||
python3 setup.py install && \
|
|
||||||
rm -rf /Pillow-${PILLOW} /Minecraft-Overviewer-${OVERVIEWER}/ && \
|
|
||||||
setup-timezone -z Europe/Berlin && \
|
|
||||||
apk del git build-base python3-dev zlib-dev jpeg-dev py3-numpy-dev tzdata alpine-conf && \
|
|
||||||
echo '0 * * * * /usr/bin/overviewer.py --config /overviewer.conf' > /var/spool/cron/crontabs/overviewer && \
|
|
||||||
adduser -D overviewer
|
|
||||||
|
|
||||||
COPY cron.sh /
|
|
||||||
|
|
||||||
CMD ["sh", "/cron.sh"]
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
set -eu
|
|
||||||
|
|
||||||
exec busybox crond -f -l 0 -L /dev/stdout
|
|
||||||
Loading…
Reference in New Issue