Update Docker image base

This commit is contained in:
sfan5 2024-02-17 12:34:34 +01:00
parent f483d10c95
commit 0f2517070e

@ -1,8 +1,8 @@
ARG DOCKER_IMAGE=alpine:3.16 ARG DOCKER_IMAGE=alpine:3.19
FROM $DOCKER_IMAGE AS dev FROM $DOCKER_IMAGE AS dev
ENV IRRLICHT_VERSION master ENV IRRLICHT_VERSION master
ENV SPATIALINDEX_VERSION 1.9.3 ENV SPATIALINDEX_VERSION master
ENV LUAJIT_VERSION v2.1 ENV LUAJIT_VERSION v2.1
RUN apk add --no-cache git build-base cmake curl-dev zlib-dev zstd-dev \ 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 gmp-dev jsoncpp-dev ninja ca-certificates
WORKDIR /usr/src/ 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 && \ cd prometheus-cpp && \
cmake -B build \ cmake -B build \
-DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_PREFIX=/usr/local \
@ -29,9 +29,9 @@ RUN git clone --recursive https://github.com/jupp0r/prometheus-cpp/ && \
cd /usr/src/ && \ cd /usr/src/ && \
git clone --recursive https://luajit.org/git/luajit.git -b ${LUAJIT_VERSION} && \ git clone --recursive https://luajit.org/git/luajit.git -b ${LUAJIT_VERSION} && \
cd luajit && \ cd luajit && \
make && make install && \ make amalg && make install && \
cd /usr/src/ && \ 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 cp -r irrlicht/include /usr/include/irrlichtmt
FROM dev as builder FROM dev as builder
@ -56,13 +56,12 @@ RUN cmake -B build \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DBUILD_SERVER=TRUE \ -DBUILD_SERVER=TRUE \
-DENABLE_PROMETHEUS=TRUE \ -DENABLE_PROMETHEUS=TRUE \
-DBUILD_UNITTESTS=FALSE \ -DBUILD_UNITTESTS=FALSE -DBUILD_BENCHMARKS=FALSE \
-DBUILD_CLIENT=FALSE \ -DBUILD_CLIENT=FALSE \
-GNinja && \ -GNinja && \
cmake --build build && \ cmake --build build && \
cmake --install build cmake --install build
ARG DOCKER_IMAGE=alpine:3.16
FROM $DOCKER_IMAGE AS runtime FROM $DOCKER_IMAGE AS runtime
RUN apk add --no-cache curl gmp libstdc++ libgcc libpq jsoncpp zstd-libs \ RUN apk add --no-cache curl gmp libstdc++ libgcc libpq jsoncpp zstd-libs \