From 0f2517070e2a2e7a45ececbf88c82a717270e97f Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sat, 17 Feb 2024 12:34:34 +0100 Subject: [PATCH] Update Docker image base --- Dockerfile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4564d780f..95476663f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG DOCKER_IMAGE=alpine:3.16 +ARG DOCKER_IMAGE=alpine:3.19 FROM $DOCKER_IMAGE AS dev ENV IRRLICHT_VERSION master -ENV SPATIALINDEX_VERSION 1.9.3 +ENV SPATIALINDEX_VERSION master ENV LUAJIT_VERSION v2.1 RUN apk add --no-cache git build-base cmake curl-dev zlib-dev zstd-dev \ @@ -10,7 +10,7 @@ RUN apk add --no-cache git build-base cmake curl-dev zlib-dev zstd-dev \ gmp-dev jsoncpp-dev ninja ca-certificates WORKDIR /usr/src/ -RUN git clone --recursive https://github.com/jupp0r/prometheus-cpp/ && \ +RUN git clone --recursive https://github.com/jupp0r/prometheus-cpp && \ cd prometheus-cpp && \ cmake -B build \ -DCMAKE_INSTALL_PREFIX=/usr/local \ @@ -29,9 +29,9 @@ RUN git clone --recursive https://github.com/jupp0r/prometheus-cpp/ && \ cd /usr/src/ && \ git clone --recursive https://luajit.org/git/luajit.git -b ${LUAJIT_VERSION} && \ cd luajit && \ - make && make install && \ + make amalg && make install && \ cd /usr/src/ && \ - git clone --depth=1 https://github.com/minetest/irrlicht/ -b ${IRRLICHT_VERSION} && \ + git clone --depth=1 https://github.com/minetest/irrlicht -b ${IRRLICHT_VERSION} && \ cp -r irrlicht/include /usr/include/irrlichtmt FROM dev as builder @@ -56,13 +56,12 @@ RUN cmake -B build \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SERVER=TRUE \ -DENABLE_PROMETHEUS=TRUE \ - -DBUILD_UNITTESTS=FALSE \ + -DBUILD_UNITTESTS=FALSE -DBUILD_BENCHMARKS=FALSE \ -DBUILD_CLIENT=FALSE \ -GNinja && \ cmake --build build && \ cmake --install build -ARG DOCKER_IMAGE=alpine:3.16 FROM $DOCKER_IMAGE AS runtime RUN apk add --no-cache curl gmp libstdc++ libgcc libpq jsoncpp zstd-libs \