diff options
author | ShadowNinja <shadowninja@minetest.net> | 2022-01-31 19:42:24 -0500 |
---|---|---|
committer | rubenwardy <rw@rubenwardy.com> | 2022-04-08 14:55:21 +0100 |
commit | 24a0f55c9c84b2625a564fd07d9da75eaac9c60d (patch) | |
tree | 36d704d98a7605ffae40e025ea3f88fd1cb058d5 /Dockerfile | |
parent | f5e54cd39845aeeff50cdbebf625abf3c4a5b92d (diff) | |
download | minetest-24a0f55c9c84b2625a564fd07d9da75eaac9c60d.tar.gz minetest-24a0f55c9c84b2625a564fd07d9da75eaac9c60d.tar.bz2 minetest-24a0f55c9c84b2625a564fd07d9da75eaac9c60d.zip |
Use CMake's -B, --build, and --install options
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 |