From 8710bf0429becb697e2129947369abd5b6e886f4 Mon Sep 17 00:00:00 2001 From: Thomas Rudin Date: Sun, 18 Aug 2019 20:51:37 +0200 Subject: [PATCH 1/4] explicit ignore --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d26bfeb..84c2870 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -minetest -postgres +data/minetest +data/postgres images docker-compose.override.yml From 76e8292a6c3056545560726c804750f04f0bb846 Mon Sep 17 00:00:00 2001 From: Thomas Rudin Date: Sun, 18 Aug 2019 20:51:52 +0200 Subject: [PATCH 2/4] import docker builder from https://git.rudin.io/docker/minetest-docker --- docker/minetest/Dockerfile | 66 ++++++++++++++++++++++++++++++++++++++ docker/minetest/Makefile | 18 +++++++++++ 2 files changed, 84 insertions(+) create mode 100644 docker/minetest/Dockerfile create mode 100644 docker/minetest/Makefile diff --git a/docker/minetest/Dockerfile b/docker/minetest/Dockerfile new file mode 100644 index 0000000..b7eea4d --- /dev/null +++ b/docker/minetest/Dockerfile @@ -0,0 +1,66 @@ +FROM ubuntu:19.10 + + +ENV ENGINE_BRANCH=pandorabox +ENV ENGINE_REPO=https://github.com/thomasrudin-mt/minetest.git +ENV GAME_BRANCH=5.0.1 +ENV GAME_REPO=https://github.com/minetest/minetest_game.git + + +# https://github.com/minetest/minetest +RUN apt-get update &&\ + apt-get install -y build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libsqlite3-dev libcurl4-openssl-dev \ + zlib1g-dev libgmp-dev libjsoncpp-dev git libluajit-5.1-dev lua5.1 \ + libjsoncpp-dev libgmp-dev postgresql-server-dev-all postgresql-client libspatialindex5 libspatialindex-dev + +RUN mkdir /git + +# prometheus stuff +RUN cd /git && git clone https://github.com/jupp0r/prometheus-cpp -b v0.7.0 &&\ + cd prometheus-cpp &&\ + git submodule init &&\ + git submodule update &&\ + mkdir _build && cd _build &&\ + cmake .. -DBUILD_SHARED_LIBS=ON &&\ + make -j4 &&\ + make install &&\ + cp /usr/local/lib/libprometheus-cpp-*.so /lib/x86_64-linux-gnu &&\ + cp /usr/local/lib/libprometheus-cpp-*.so /lib/x86_64-linux-gnu/ + +# minetest +RUN cd /git && git clone ${ENGINE_REPO} -b ${ENGINE_BRANCH} &&\ + cd /git/minetest/ && git clone --depth 1 ${GAME_REPO} games/minetest_game -b ${GAME_BRANCH} &&\ + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr/local\ + -DCMAKE_BUILD_TYPE=Release\ + -DRUN_IN_PLACE=FALSE\ + -DBUILD_SERVER=TRUE\ + -DBUILD_CLIENT=FALSE\ + -DENABLE_SPATIAL=TRUE\ + -DENABLE_LUAJIT=TRUE\ + -DENABLE_CURSES=TRUE\ + -DENABLE_POSTGRESQL=TRUE\ + -DENABLE_SYSTEM_GMP=TRUE \ + -DENABLE_SYSTEM_JSONCPP=TRUE \ + -DVERSION_EXTRA=docker &&\ + make -j4 &&\ + make install + + +FROM ubuntu:19.10 + +RUN groupadd minetest && useradd -m -g minetest -d /var/lib/minetest minetest && \ + apt-get update -y && \ + apt-get -y install libcurl4 libjsoncpp1 liblua5.1-0 libluajit-5.1-2 libpq5 libsqlite3-0 \ + libstdc++6 zlib1g libc6 libspatialindex5 libpq5 postgresql-client + +WORKDIR /var/lib/minetest + +COPY --from=0 /usr/local/share/minetest /usr/local/share/minetest +COPY --from=0 /usr/local/bin/minetestserver /usr/local/bin/minetestserver +COPY --from=0 /usr/local/lib/libprometheus-cpp-*.so /lib/x86_64-linux-gnu/ + +EXPOSE 30000/udp + +CMD ["/usr/local/bin/minetestserver", "--config", "/etc/minetest/minetest.conf"] + diff --git a/docker/minetest/Makefile b/docker/minetest/Makefile new file mode 100644 index 0000000..fe76f1c --- /dev/null +++ b/docker/minetest/Makefile @@ -0,0 +1,18 @@ +TAG=registry.rudin.io/x86/minetest:pandorabox + +MOUNTS=-v /tmp/.X11-unix:/tmp/.X11-unix +PORTS=-p 30000:30000 +ENVIRONMENT=-e DISPLAY=$(DISPLAY) + +RUNDEFAULT=docker run -it --rm $(MOUNTS) $(ENVIRONMENT) $(PORTS) $(TAG) + + + +build: + docker build -t $(TAG) . + +push: + docker push $(TAG) + +run: + $(RUNDEFAULT) /bin/bash From 2a051a0f953fd0202e2c19c994469cf1ffdd3e0c Mon Sep 17 00:00:00 2001 From: NatureFreshMilk Date: Mon, 19 Aug 2019 07:33:53 +0200 Subject: [PATCH 3/4] mt repo move --- docker/minetest/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/minetest/Dockerfile b/docker/minetest/Dockerfile index b7eea4d..a6c742e 100644 --- a/docker/minetest/Dockerfile +++ b/docker/minetest/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:19.10 ENV ENGINE_BRANCH=pandorabox -ENV ENGINE_REPO=https://github.com/thomasrudin-mt/minetest.git +ENV ENGINE_REPO=https://github.com/pandorabox-io/minetest.git ENV GAME_BRANCH=5.0.1 ENV GAME_REPO=https://github.com/minetest/minetest_game.git From d27ec82ed56407a6f8737e6f0990a548f0afd0f9 Mon Sep 17 00:00:00 2001 From: NatureFreshMilk Date: Mon, 19 Aug 2019 07:35:15 +0200 Subject: [PATCH 4/4] temporary fix for https://github.com/pandorabox-io/pandorabox.io/issues/277 --- docker/minetest/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/minetest/Dockerfile b/docker/minetest/Dockerfile index a6c742e..ff94765 100644 --- a/docker/minetest/Dockerfile +++ b/docker/minetest/Dockerfile @@ -56,6 +56,9 @@ RUN groupadd minetest && useradd -m -g minetest -d /var/lib/minetest minetest && WORKDIR /var/lib/minetest +RUN echo 109.106.51.238 monitoring.minetest.land >> /etc/hosts +RUN echo 185.107.80.107 servers.minetest.net >> /etc/hosts + COPY --from=0 /usr/local/share/minetest /usr/local/share/minetest COPY --from=0 /usr/local/bin/minetestserver /usr/local/bin/minetestserver COPY --from=0 /usr/local/lib/libprometheus-cpp-*.so /lib/x86_64-linux-gnu/