Android: Segmentation fault fix, PendingIntent flag, and other fixes (#12960)

[minetest.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 871ca982552b2ac9d2291af9767e2eeeb10058d7..1def5407ac47743253676f860230b0deca454c8b 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,25 @@
-FROM alpine:3.11
+ARG DOCKER_IMAGE=alpine:3.16
+FROM $DOCKER_IMAGE AS builder
 
 ENV MINETEST_GAME_VERSION master
+ENV IRRLICHT_VERSION master
+
+RUN apk add --no-cache git build-base cmake sqlite-dev curl-dev zlib-dev zstd-dev \
+               gmp-dev jsoncpp-dev postgresql-dev ninja luajit-dev ca-certificates
+
+WORKDIR /usr/src/
+RUN git clone --recursive https://github.com/jupp0r/prometheus-cpp/ && \
+       cd prometheus-cpp && \
+       cmake -B build \
+               -DCMAKE_INSTALL_PREFIX=/usr/local \
+               -DCMAKE_BUILD_TYPE=Release \
+               -DENABLE_TESTING=0 \
+               -GNinja && \
+       cmake --build build && \
+       cmake --install build
+
+RUN git clone --depth=1 https://github.com/minetest/irrlicht/ -b ${IRRLICHT_VERSION} && \
+       cp -r irrlicht/include /usr/include/irrlichtmt
 
 COPY .git /usr/src/minetest/.git
 COPY CMakeLists.txt /usr/src/minetest/CMakeLists.txt
@@ -17,52 +36,36 @@ COPY src /usr/src/minetest/src
 COPY textures /usr/src/minetest/textures
 
 WORKDIR /usr/src/minetest
-
-RUN apk add --no-cache git build-base irrlicht-dev cmake bzip2-dev libpng-dev \
-               jpeg-dev libxxf86vm-dev mesa-dev sqlite-dev libogg-dev \
-               libvorbis-dev openal-soft-dev curl-dev freetype-dev zlib-dev \
-               gmp-dev jsoncpp-dev postgresql-dev luajit-dev ca-certificates && \
-       git clone --depth=1 -b ${MINETEST_GAME_VERSION} https://github.com/minetest/minetest_game.git ./games/minetest_game && \
-       rm -fr ./games/minetest_game/.git
-
-WORKDIR /usr/src/
-RUN git clone --recursive https://github.com/jupp0r/prometheus-cpp/ && \
-       mkdir prometheus-cpp/build && \
-       cd prometheus-cpp/build && \
-       cmake .. \
-               -DCMAKE_INSTALL_PREFIX=/usr/local \
-               -DCMAKE_BUILD_TYPE=Release \
-               -DENABLE_TESTING=0 && \
-       make -j2 && \
-       make install
-
-WORKDIR /usr/src/minetest
-RUN mkdir build && \
-       cd build && \
-       cmake .. \
+RUN git clone --depth=1 -b ${MINETEST_GAME_VERSION} https://github.com/minetest/minetest_game.git ./games/minetest_game && \
+       rm -fr ./games/minetest_game/.git && \
+       cmake -B build \
                -DCMAKE_INSTALL_PREFIX=/usr/local \
                -DCMAKE_BUILD_TYPE=Release \
                -DBUILD_SERVER=TRUE \
                -DENABLE_PROMETHEUS=TRUE \
                -DBUILD_UNITTESTS=FALSE \
-               -DBUILD_CLIENT=FALSE && \
-       make -j2 && \
-       make install
+               -DBUILD_CLIENT=FALSE \
+               -GNinja && \
+       cmake --build build && \
+       cmake --install build
 
-FROM alpine:3.11
+ARG DOCKER_IMAGE=alpine:3.16
+FROM $DOCKER_IMAGE AS runtime
 
-RUN apk add --no-cache sqlite-libs curl gmp libstdc++ libgcc libpq luajit && \
+RUN apk add --no-cache sqlite-libs curl gmp libstdc++ libgcc libpq luajit jsoncpp zstd-libs && \
        adduser -D minetest --uid 30000 -h /var/lib/minetest && \
        chown -R minetest:minetest /var/lib/minetest
 
 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/share/doc/minetest/minetest.conf.example /etc/minetest/minetest.conf
+COPY --from=builder /usr/local/share/minetest /usr/local/share/minetest
+COPY --from=builder /usr/local/bin/minetestserver /usr/local/bin/minetestserver
+COPY --from=builder /usr/local/share/doc/minetest/minetest.conf.example /etc/minetest/minetest.conf
 
 USER minetest:minetest
 
 EXPOSE 30000/udp 30000/tcp
+VOLUME /var/lib/minetest/ /etc/minetest/
 
-CMD ["/usr/local/bin/minetestserver", "--config", "/etc/minetest/minetest.conf"]
+ENTRYPOINT ["/usr/local/bin/minetestserver"]
+CMD ["--config", "/etc/minetest/minetest.conf"]