diff options
| author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2022-05-17 22:12:00 +0200 |
|---|---|---|
| committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2022-05-17 22:12:00 +0200 |
| commit | 21df26984da91143c15587f5a03c98d68c3adc4e (patch) | |
| tree | aaa707a628ad331f67890023dffe1b4f60dd01d3 /Dockerfile | |
| parent | b09fc5de5cdb021f43ad32b7e3f50dc75c0bc622 (diff) | |
| parent | eabf05758e3ba5f6f4bb1b8d1d1f02179b84e410 (diff) | |
| download | dragonfireclient-21df26984da91143c15587f5a03c98d68c3adc4e.tar.xz | |
Merge branch 'master' of https://github.com/minetest/minetest
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/Dockerfile b/Dockerfile index 8d1008fa2..3dd82e772 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,23 +27,20 @@ RUN apk add --no-cache git build-base cmake sqlite-dev curl-dev zlib-dev zstd-de 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,8 +48,8 @@ RUN mkdir build && \ -DBUILD_UNITTESTS=FALSE \ -DBUILD_CLIENT=FALSE \ -GNinja && \ - ninja && \ - ninja install + cmake --build build && \ + cmake --install build ARG DOCKER_IMAGE=alpine:3.14 FROM $DOCKER_IMAGE AS runtime |