Merge pull request #59 from PrairieAstronomer/readme_irrlicht_change

[dragonfireclient.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index d93a42e3889fe765959e8301c95cb7a266dd0099..3dd82e772cd3c16347d94c222bfab045ec692951 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG DOCKER_IMAGE=alpine:3.13
+ARG DOCKER_IMAGE=alpine:3.14
 FROM $DOCKER_IMAGE AS builder
 
 ENV MINETEST_GAME_VERSION master
@@ -20,30 +20,27 @@ COPY textures /usr/src/minetest/textures
 
 WORKDIR /usr/src/minetest
 
-RUN apk add --no-cache git build-base cmake sqlite-dev curl-dev zlib-dev \
+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 && \
        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 .. \
+       cd prometheus-cpp && \
+       cmake -B build \
                -DCMAKE_INSTALL_PREFIX=/usr/local \
                -DCMAKE_BUILD_TYPE=Release \
                -DENABLE_TESTING=0 \
                -GNinja && \
-       ninja && \
-       ninja install
+       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
 
 WORKDIR /usr/src/minetest
-RUN mkdir build && \
-       cd build && \
-       cmake .. \
+RUN cmake -B build \
                -DCMAKE_INSTALL_PREFIX=/usr/local \
                -DCMAKE_BUILD_TYPE=Release \
                -DBUILD_SERVER=TRUE \
@@ -51,13 +48,13 @@ RUN mkdir build && \
                -DBUILD_UNITTESTS=FALSE \
                -DBUILD_CLIENT=FALSE \
                -GNinja && \
-       ninja && \
-       ninja install
+       cmake --build build && \
+       cmake --install build
 
-ARG DOCKER_IMAGE=alpine:3.13
+ARG DOCKER_IMAGE=alpine:3.14
 FROM $DOCKER_IMAGE AS runtime
 
-RUN apk add --no-cache sqlite-libs curl gmp libstdc++ libgcc libpq luajit jsoncpp && \
+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