From 1f46795fa19f06b4f8b2dbc3d5186cdc105be978 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 17 Mar 2022 23:18:08 -0400 Subject: [PATCH 1/8] 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." } From e3aee7ba3545525f0f12fead7bef571bb35cc5e6 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 17 Mar 2022 23:19:46 -0400 Subject: [PATCH 2/8] fix typo --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1b81deb..b022a9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,7 +57,7 @@ RUN \ lua-socket \ sqlite \ sqlite-libs \ - zstd + zstd \ zstd-libs && \ echo "**** compile spatialindex ****" && \ git clone https://github.com/libspatialindex/libspatialindex /tmp/spatialindex && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 094bb93..7a87503 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -57,7 +57,7 @@ RUN \ lua-socket \ sqlite \ sqlite-libs \ - zstd + zstd \ zstd-libs && \ echo "**** compile spatialindex ****" && \ git clone https://github.com/libspatialindex/libspatialindex /tmp/spatialindex && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 2e124e0..70a30c5 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -57,7 +57,7 @@ RUN \ lua-socket \ sqlite \ sqlite-libs \ - zstd + zstd \ zstd-libs && \ echo "**** compile spatialindex ****" && \ git clone https://github.com/libspatialindex/libspatialindex /tmp/spatialindex && \ From 6e3c18194c72828edc19da0416966fbe21e0d837 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 18 Mar 2022 16:58:04 +0100 Subject: [PATCH 3/8] Bot Updating Package Versions --- package_versions.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2f1512f..ce34364 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,26 +1,26 @@ alpine-baselayout-3.2.0-r18 alpine-keys-2.4-r1 apk-tools-2.12.7-r3 -bash-5.1.8-r0 +bash-5.1.16-r0 brotli-libs-1.0.9-r5 -busybox-1.34.1-r3 +busybox-1.34.1-r4 ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 coreutils-9.0-r2 curl-7.80.0-r0 -gmp-6.2.1-r0 +gmp-6.2.1-r1 hiredis-1.0.2-r0 leveldb-1.22-r1 libacl-2.2.53-r0 libattr-2.5.1-r1 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1l-r8 +libcrypto1.1-1.1.1n-r0 libcurl-7.80.0-r0 libgcc-10.3.1_git20211027-r0 libintl-0.21-r0 libproc-3.3.17-r0 libretls-3.3.4-r2 -libssl1.1-1.1.1l-r8 +libssl1.1-1.1.1n-r0 libstdc++-10.3.1_git20211027-r0 linux-pam-1.5.2-r0 lua-socket-3.0_rc1_git20160306-r3 @@ -39,9 +39,11 @@ skalibs-2.11.0.0-r0 snappy-1.1.9-r1 sqlite-3.36.0-r0 sqlite-libs-3.36.0-r0 -ssl_client-1.34.1-r3 +ssl_client-1.34.1-r4 tzdata-2021e-r0 utmps-0.1.0.3-r0 xz-5.2.5-r0 xz-libs-5.2.5-r0 zlib-1.2.11-r3 +zstd-1.5.0-r0 +zstd-libs-1.5.0-r0 From 34679a4f5bba1b9441a9606bdae621922da52d87 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 24 Mar 2022 21:33:04 -0500 Subject: [PATCH 4/8] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ce34364..a3c01ab 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -19,7 +19,7 @@ libcurl-7.80.0-r0 libgcc-10.3.1_git20211027-r0 libintl-0.21-r0 libproc-3.3.17-r0 -libretls-3.3.4-r2 +libretls-3.3.4-r3 libssl1.1-1.1.1n-r0 libstdc++-10.3.1_git20211027-r0 linux-pam-1.5.2-r0 @@ -40,7 +40,7 @@ snappy-1.1.9-r1 sqlite-3.36.0-r0 sqlite-libs-3.36.0-r0 ssl_client-1.34.1-r4 -tzdata-2021e-r0 +tzdata-2022a-r0 utmps-0.1.0.3-r0 xz-5.2.5-r0 xz-libs-5.2.5-r0 From 8bcb40c9f95ee035954209dff3a59a491c60a5ae Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 31 Mar 2022 22:06:57 -0500 Subject: [PATCH 5/8] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index a3c01ab..3771651 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -44,6 +44,6 @@ tzdata-2022a-r0 utmps-0.1.0.3-r0 xz-5.2.5-r0 xz-libs-5.2.5-r0 -zlib-1.2.11-r3 +zlib-1.2.12-r0 zstd-1.5.0-r0 zstd-libs-1.5.0-r0 From a2420abee36dba9867117701cfa19550dca6ff2c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 7 Apr 2022 21:53:45 -0500 Subject: [PATCH 6/8] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3771651..d63e647 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,7 +3,7 @@ alpine-keys-2.4-r1 apk-tools-2.12.7-r3 bash-5.1.16-r0 brotli-libs-1.0.9-r5 -busybox-1.34.1-r4 +busybox-1.34.1-r5 ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 coreutils-9.0-r2 @@ -39,7 +39,7 @@ skalibs-2.11.0.0-r0 snappy-1.1.9-r1 sqlite-3.36.0-r0 sqlite-libs-3.36.0-r0 -ssl_client-1.34.1-r4 +ssl_client-1.34.1-r5 tzdata-2022a-r0 utmps-0.1.0.3-r0 xz-5.2.5-r0 From 38c1905e5d758a63789c1b8b47c3f3dc8999d00d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 14 Apr 2022 22:13:06 -0500 Subject: [PATCH 7/8] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d63e647..6221a5e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -42,8 +42,8 @@ sqlite-libs-3.36.0-r0 ssl_client-1.34.1-r5 tzdata-2022a-r0 utmps-0.1.0.3-r0 -xz-5.2.5-r0 -xz-libs-5.2.5-r0 +xz-5.2.5-r1 +xz-libs-5.2.5-r1 zlib-1.2.12-r0 zstd-1.5.0-r0 zstd-libs-1.5.0-r0 From 50281e549a077163b30701eebdee91e9ba75fd95 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 29 Apr 2022 05:18:53 +0200 Subject: [PATCH 8/8] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6221a5e..48846b3 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -7,7 +7,7 @@ busybox-1.34.1-r5 ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 coreutils-9.0-r2 -curl-7.80.0-r0 +curl-7.80.0-r1 gmp-6.2.1-r1 hiredis-1.0.2-r0 leveldb-1.22-r1 @@ -15,7 +15,7 @@ libacl-2.2.53-r0 libattr-2.5.1-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1n-r0 -libcurl-7.80.0-r0 +libcurl-7.80.0-r1 libgcc-10.3.1_git20211027-r0 libintl-0.21-r0 libproc-3.3.17-r0 @@ -44,6 +44,6 @@ tzdata-2022a-r0 utmps-0.1.0.3-r0 xz-5.2.5-r1 xz-libs-5.2.5-r1 -zlib-1.2.12-r0 +zlib-1.2.12-r1 zstd-1.5.0-r0 zstd-libs-1.5.0-r0