From 13b50f55a45b8e68a787e7793d5e6e612d95a5a0 Mon Sep 17 00:00:00 2001 From: Lejo Date: Tue, 9 Mar 2021 00:57:12 +0100 Subject: Fix missing jsoncpp in the Docker image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 871ca9825..33eba64ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,7 +51,7 @@ RUN mkdir build && \ FROM alpine:3.11 -RUN apk add --no-cache sqlite-libs curl gmp libstdc++ libgcc libpq luajit && \ +RUN apk add --no-cache sqlite-libs curl gmp libstdc++ libgcc libpq luajit jsoncpp && \ adduser -D minetest --uid 30000 -h /var/lib/minetest && \ chown -R minetest:minetest /var/lib/minetest -- cgit v1.2.3 From c4b048fbb395bcfaa0627e5de672dd1064a7301e Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Fri, 2 Apr 2021 09:25:50 +0200 Subject: fix: don't send the whole local context to the docker image --- .dockerignore | 4 ++++ Dockerfile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .dockerignore (limited to 'Dockerfile') diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..bda43ebc0 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,4 @@ +./cmake-build-* +./build/* +./cache/* +Dockerfile diff --git a/Dockerfile b/Dockerfile index 33eba64ca..a1b5a7be3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,7 +49,7 @@ RUN mkdir build && \ make -j2 && \ make install -FROM alpine:3.11 +FROM alpine:3.13 RUN apk add --no-cache sqlite-libs curl gmp libstdc++ libgcc libpq luajit jsoncpp && \ adduser -D minetest --uid 30000 -h /var/lib/minetest && \ -- cgit v1.2.3 From 78da79b60f65d7a236b8589a508e41aba834649b Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Fri, 2 Apr 2021 09:26:03 +0200 Subject: fix: use irrlicht fork instead of the standard library --- Dockerfile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index a1b5a7be3..e9a008bbf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ -FROM alpine:3.11 +FROM alpine:3.13 ENV MINETEST_GAME_VERSION master +ENV IRRLICHT_VERSION master COPY .git /usr/src/minetest/.git COPY CMakeLists.txt /usr/src/minetest/CMakeLists.txt @@ -18,7 +19,7 @@ COPY textures /usr/src/minetest/textures WORKDIR /usr/src/minetest -RUN apk add --no-cache git build-base irrlicht-dev cmake bzip2-dev libpng-dev \ +RUN apk add --no-cache git build-base cmake bzip2-dev libpng-dev \ jpeg-dev libxxf86vm-dev mesa-dev sqlite-dev libogg-dev \ libvorbis-dev openal-soft-dev curl-dev freetype-dev zlib-dev \ gmp-dev jsoncpp-dev postgresql-dev luajit-dev ca-certificates && \ @@ -36,6 +37,14 @@ RUN git clone --recursive https://github.com/jupp0r/prometheus-cpp/ && \ make -j2 && \ make install +RUN git clone --depth=1 https://github.com/minetest/irrlicht/ -b ${IRRLICHT_VERSION} && \ + mkdir irrlicht/build && \ + cd irrlicht/build && \ + cmake .. \ + -DCMAKE_BUILD_TYPE=Release && \ + make -j2 && \ + make install + WORKDIR /usr/src/minetest RUN mkdir build && \ cd build && \ -- cgit v1.2.3 From 5de849713eb30c88c6d37b2fe9faa7ed65ce51f2 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Fri, 2 Apr 2021 12:25:52 +0200 Subject: fix(docker): reduce the number of required libraries on build --- Dockerfile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index e9a008bbf..7cb6bec84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,9 +19,7 @@ COPY textures /usr/src/minetest/textures WORKDIR /usr/src/minetest -RUN apk add --no-cache git build-base cmake bzip2-dev libpng-dev \ - jpeg-dev libxxf86vm-dev mesa-dev sqlite-dev libogg-dev \ - libvorbis-dev openal-soft-dev curl-dev freetype-dev zlib-dev \ +RUN apk add --no-cache git build-base cmake sqlite-dev curl-dev zlib-dev \ gmp-dev jsoncpp-dev postgresql-dev 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 @@ -38,12 +36,7 @@ RUN git clone --recursive https://github.com/jupp0r/prometheus-cpp/ && \ make install RUN git clone --depth=1 https://github.com/minetest/irrlicht/ -b ${IRRLICHT_VERSION} && \ - mkdir irrlicht/build && \ - cd irrlicht/build && \ - cmake .. \ - -DCMAKE_BUILD_TYPE=Release && \ - make -j2 && \ - make install + cp -r irrlicht/include /usr/include/irrlichtmt WORKDIR /usr/src/minetest RUN mkdir build && \ -- cgit v1.2.3