run overviewer on own user, refactor dockerfile, read rcon password fron env
parent
315d839a78
commit
7582c9853f
|
|
@ -1,3 +1,5 @@
|
||||||
|
from os import getenv
|
||||||
|
|
||||||
worlds["survival"] = "/world/"
|
worlds["survival"] = "/world/"
|
||||||
|
|
||||||
world = "survival"
|
world = "survival"
|
||||||
|
|
@ -44,6 +46,6 @@ renders['mineralover'] = {
|
||||||
from .observer import MultiplexingObserver, LoggingObserver, JSObserver, RConObserver
|
from .observer import MultiplexingObserver, LoggingObserver, JSObserver, RConObserver
|
||||||
loggingObserver = LoggingObserver()
|
loggingObserver = LoggingObserver()
|
||||||
jsObserver = JSObserver(outputdir=outputdir, minrefresh=10)
|
jsObserver = JSObserver(outputdir=outputdir, minrefresh=10)
|
||||||
rconObserver = RConObserver(target="minecraft", password="minecraft")
|
rconObserver = RConObserver(target="minecraft", password=getenv("RCON_PASSWORD", "minecraft"))
|
||||||
observer = MultiplexingObserver(loggingObserver, jsObserver, rconObserver)
|
observer = MultiplexingObserver(loggingObserver, jsObserver, rconObserver)
|
||||||
#observer = MultiplexingObserver(loggingObserver, jsObserver)
|
#observer = MultiplexingObserver(loggingObserver, jsObserver)
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,8 @@ services:
|
||||||
overviewer:
|
overviewer:
|
||||||
image: docker.clkl.de/minecraft/overviewer:0.16
|
image: docker.clkl.de/minecraft/overviewer:0.16
|
||||||
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/
|
||||||
|
|
|
||||||
|
|
@ -6,3 +6,4 @@ SERVER_NAME=KinfCraft
|
||||||
MAX_PLAYERS=50
|
MAX_PLAYERS=50
|
||||||
SNOOPER_ENABLED=false
|
SNOOPER_ENABLED=false
|
||||||
MOTD=providing fun for kinf!
|
MOTD=providing fun for kinf!
|
||||||
|
RCON_PASSWORD=minecraft@kinf
|
||||||
|
|
|
||||||
|
|
@ -2,14 +2,21 @@ FROM alpine:3.12
|
||||||
|
|
||||||
# install pillow form instead of py3-pillow to use the source (no -dev package available)
|
# 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 && \
|
ENV PILLOW=7.2.0
|
||||||
apk add python3 py3-pip py3-numpy zlib jpeg && pip3 install pillow==7.2.0 && \
|
ENV OVERVIEWER=0.16.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 && \
|
RUN apk update && apk add git build-base python3-dev zlib-dev jpeg-dev py3-numpy-dev tzdata alpine-conf && \
|
||||||
cd /Minecraft-Overviewer-0.16.0/ && \
|
apk add python3 py3-pip py3-numpy zlib jpeg && pip3 install pillow==${PILLOW} && \
|
||||||
PIL_INCLUDE_DIR=/Pillow-7.2.0/src/libImaging/ python3 setup.py build && \
|
wget https://github.com/python-pillow/Pillow/archive/${PILLOW}.tar.gz -O /pillow.tgz && tar -xzf /pillow.tgz && \
|
||||||
rm -rf /Pillow-7.2.0 && apk del git build-base python3-dev zlib-dev jpeg-dev py3-numpy-dev && \
|
wget https://github.com/overviewer/Minecraft-Overviewer/archive/v${OVERVIEWER}.tar.gz -O ov.tgz && tar -xzf ov.tgz && \
|
||||||
echo '0 * * * * /Minecraft-Overviewer-0.16.0/overviewer.py --config /overviewer.conf' > /var/spool/cron/crontabs/root
|
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 /
|
COPY cron.sh /
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue