From 1f46795fa19f06b4f8b2dbc3d5186cdc105be978 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 17 Mar 2022 23:18:08 -0400 Subject: [PATCH] install forked irrlicht, add zstd --- Dockerfile | 20 +++++++++++++++++--- Dockerfile.aarch64 | 20 +++++++++++++++++--- Dockerfile.armhf | 20 +++++++++++++++++--- README.md | 3 ++- readme-vars.yml | 3 ++- 5 files changed, 55 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 996bd65..1b81deb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,6 @@ RUN \ gmp-dev \ hiredis-dev \ icu-dev \ - irrlicht-dev \ jq \ leveldb-dev \ libjpeg-turbo-dev \ @@ -43,7 +42,8 @@ RUN \ ncurses-dev \ openal-soft-dev \ python3-dev \ - sqlite-dev && \ + sqlite-dev \ + zstd-dev && \ echo "**** install runtime packages ****" && \ apk add --no-cache \ curl \ @@ -56,7 +56,9 @@ RUN \ luajit \ lua-socket \ sqlite \ - sqlite-libs && \ + sqlite-libs \ + zstd + zstd-libs && \ echo "**** compile spatialindex ****" && \ git clone https://github.com/libspatialindex/libspatialindex /tmp/spatialindex && \ cd /tmp/spatialindex && \ @@ -64,6 +66,18 @@ RUN \ -DCMAKE_INSTALL_PREFIX=/usr && \ make -j 2 && \ make install && \ + echo "**** compile irrlicht ****" && \ + mkdir -p /tmp/irrlicht && \ + IRRLICHT_VER=$(curl -sX GET "https://api.github.com/repos/minetest/irrlicht/releases/latest" \ + | jq -r .tag_name) && \ + curl -o /tmp/irrlicht.tar.gz \ + -L "https://github.com/minetest/irrlicht/archive/${IRRLICHT_VER}.tar.gz" && \ + tar xf /tmp/irrlicht.tar.gz -C \ + /tmp/irrlicht --strip-components=1 && \ + cd /tmp/irrlicht && \ + cmake . && \ + make -j 2 && \ + make install && \ echo "**** compile minetestserver ****" && \ if [ -z ${MINETEST_RELEASE+x} ]; then \ MINETEST_RELEASE=$(curl -sX GET "https://api.github.com/repos/minetest/minetest/releases" \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 2c9f82a..094bb93 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -28,7 +28,6 @@ RUN \ gmp-dev \ hiredis-dev \ icu-dev \ - irrlicht-dev \ jq \ leveldb-dev \ libjpeg-turbo-dev \ @@ -43,7 +42,8 @@ RUN \ ncurses-dev \ openal-soft-dev \ python3-dev \ - sqlite-dev && \ + sqlite-dev \ + zstd-dev && \ echo "**** install runtime packages ****" && \ apk add --no-cache \ curl \ @@ -56,7 +56,9 @@ RUN \ luajit \ lua-socket \ sqlite \ - sqlite-libs && \ + sqlite-libs \ + zstd + zstd-libs && \ echo "**** compile spatialindex ****" && \ git clone https://github.com/libspatialindex/libspatialindex /tmp/spatialindex && \ cd /tmp/spatialindex && \ @@ -64,6 +66,18 @@ RUN \ -DCMAKE_INSTALL_PREFIX=/usr && \ make -j 2 && \ make install && \ + echo "**** compile irrlicht ****" && \ + mkdir -p /tmp/irrlicht && \ + IRRLICHT_VER=$(curl -sX GET "https://api.github.com/repos/minetest/irrlicht/releases/latest" \ + | jq -r .tag_name) && \ + curl -o /tmp/irrlicht.tar.gz \ + -L "https://github.com/minetest/irrlicht/archive/${IRRLICHT_VER}.tar.gz" && \ + tar xf /tmp/irrlicht.tar.gz -C \ + /tmp/irrlicht --strip-components=1 && \ + cd /tmp/irrlicht && \ + cmake . && \ + make -j 2 && \ + make install && \ echo "**** compile minetestserver ****" && \ if [ -z ${MINETEST_RELEASE+x} ]; then \ MINETEST_RELEASE=$(curl -sX GET "https://api.github.com/repos/minetest/minetest/releases" \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 76f1459..2e124e0 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -28,7 +28,6 @@ RUN \ gmp-dev \ hiredis-dev \ icu-dev \ - irrlicht-dev \ jq \ leveldb-dev \ libjpeg-turbo-dev \ @@ -43,7 +42,8 @@ RUN \ ncurses-dev \ openal-soft-dev \ python3-dev \ - sqlite-dev && \ + sqlite-dev \ + zstd-dev && \ echo "**** install runtime packages ****" && \ apk add --no-cache \ curl \ @@ -56,7 +56,9 @@ RUN \ luajit \ lua-socket \ sqlite \ - sqlite-libs && \ + sqlite-libs \ + zstd + zstd-libs && \ echo "**** compile spatialindex ****" && \ git clone https://github.com/libspatialindex/libspatialindex /tmp/spatialindex && \ cd /tmp/spatialindex && \ @@ -64,6 +66,18 @@ RUN \ -DCMAKE_INSTALL_PREFIX=/usr && \ make -j 2 && \ make install && \ + echo "**** compile irrlicht ****" && \ + mkdir -p /tmp/irrlicht && \ + IRRLICHT_VER=$(curl -sX GET "https://api.github.com/repos/minetest/irrlicht/releases/latest" \ + | jq -r .tag_name) && \ + curl -o /tmp/irrlicht.tar.gz \ + -L "https://github.com/minetest/irrlicht/archive/${IRRLICHT_VER}.tar.gz" && \ + tar xf /tmp/irrlicht.tar.gz -C \ + /tmp/irrlicht --strip-components=1 && \ + cd /tmp/irrlicht && \ + cmake . && \ + make -j 2 && \ + make install && \ echo "**** compile minetestserver ****" && \ if [ -z ${MINETEST_RELEASE+x} ]; then \ MINETEST_RELEASE=$(curl -sX GET "https://api.github.com/repos/minetest/minetest/releases" \ diff --git a/README.md b/README.md index 966768a..7008ab9 100644 --- a/README.md +++ b/README.md @@ -228,7 +228,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **19.01.21:** - Rebasing to alpine 3.15. +* **17.03.22:** - Install forked irrlicht, add zstd. +* **19.01.22:** - Rebasing to alpine 3.15. * **02.06.20:** - Rebasing to alpine 3.12. * **19.12.19:** - Rebasing to alpine 3.11. * **12.07.19:** - Bugfix to support multiple CLI variables. diff --git a/readme-vars.yml b/readme-vars.yml index fa04860..8ae83b7 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -49,7 +49,8 @@ app_setup_block: | https://hub.docker.com/r/linuxserver/{{ project_name }}/tags # changelog changelogs: - - { date: "19.01.21:", desc: "Rebasing to alpine 3.15." } + - { date: "17.03.22:", desc: "Install forked irrlicht, add zstd." } + - { date: "19.01.22:", desc: "Rebasing to alpine 3.15." } - { date: "02.06.20:", desc: "Rebasing to alpine 3.12." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - { date: "12.07.19:", desc: "Bugfix to support multiple CLI variables." }