All kinds of changes

linuxserver · May 12, 2024 · 8be31b1 · 8be31b1
1 parent 518e32c
commit 8be31b1
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 31 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -40,6 +40,7 @@ RUN \
     mesa-dev \
     ncurses-dev \
     openal-soft-dev \
+    postgresql-dev \
     python3-dev \
     sdl2-dev \
     sqlite-dev \
@@ -51,6 +52,7 @@ RUN \
     leveldb \
     libgcc \
     libintl \
+    libpq \
     libstdc++ \
     luajit \
     lua-socket \
@@ -61,7 +63,7 @@ RUN \
     zstd-libs && \
   echo "**** compile spatialindex ****" && \
   mkdir -p /tmp/spatialindex && \
-  SPATIAL_VER=$(curl -sX GET "https://api.github.com/repos/libspatialindex/libspatialindex/commits/master" \
+  SPATIAL_VER=$(curl -sX GET "https://api.github.com/repos/libspatialindex/libspatialindex/commits/main" \
     | jq -r .sha) && \
   curl -o /tmp/spatialindex.tar.gz \
     -L "https://github.com/libspatialindex/libspatialindex/archive/${SPATIAL_VER}.tar.gz" && \
@@ -77,7 +79,7 @@ RUN \
   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/9df2f0b9446799f9e6c67909f4bdda5cb8cd07ad.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 && \
@@ -97,6 +99,8 @@ RUN \
   tar xf \
   /tmp/minetest-src.tar.gz -C \
     /tmp/minetest --strip-components=1 && \
+  sed -i 's/# enable_ipv6 = true/enable_ipv6 = true/' /tmp/minetest/minetest.conf.example && \
+  sed -i 's/# ipv6_server = false/ipv6_server = true/' /tmp/minetest/minetest.conf.example && \
   cp /tmp/minetest/minetest.conf.example /defaults/minetest.conf && \
   cd /tmp/minetest && \
   cmake . \
@@ -111,6 +115,7 @@ RUN \
     -DENABLE_GETTEXT=0 \
     -DENABLE_LEVELDB=1 \
     -DENABLE_LUAJIT=1 \
+    -DENABLE_POSTGRESQL=1 \
     -DENABLE_REDIS=1 \
     -DENABLE_SOUND=0 \
     -DENABLE_SYSTEM_GMP=1 \

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -41,6 +41,7 @@ RUN \
     ncurses-dev \
     openal-soft-dev \
     python3-dev \
+    postgresql-dev \
     sdl2-dev \
     sqlite-dev \
     zstd-dev && \
@@ -51,6 +52,7 @@ RUN \
     leveldb \
     libgcc \
     libintl \
+    libpq \
     libstdc++ \
     luajit \
     lua-socket \
@@ -61,7 +63,7 @@ RUN \
     zstd-libs && \
   echo "**** compile spatialindex ****" && \
   mkdir -p /tmp/spatialindex && \
-  SPATIAL_VER=$(curl -sX GET "https://api.github.com/repos/libspatialindex/libspatialindex/commits/master" \
+  SPATIAL_VER=$(curl -sX GET "https://api.github.com/repos/libspatialindex/libspatialindex/commits/main" \
     | jq -r .sha) && \
   curl -o /tmp/spatialindex.tar.gz \
     -L "https://github.com/libspatialindex/libspatialindex/archive/${SPATIAL_VER}.tar.gz" && \
@@ -77,7 +79,7 @@ RUN \
   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/9df2f0b9446799f9e6c67909f4bdda5cb8cd07ad.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 && \
@@ -97,6 +99,8 @@ RUN \
   tar xf \
   /tmp/minetest-src.tar.gz -C \
     /tmp/minetest --strip-components=1 && \
+  sed -i 's/# enable_ipv6 = true/enable_ipv6 = true/' /tmp/minetest/minetest.conf.example && \
+  sed -i 's/# ipv6_server = false/ipv6_server = true/' /tmp/minetest/minetest.conf.example && \
   cp /tmp/minetest/minetest.conf.example /defaults/minetest.conf && \
   cd /tmp/minetest && \
   cmake . \
@@ -111,6 +115,7 @@ RUN \
     -DENABLE_GETTEXT=0 \
     -DENABLE_LEVELDB=1 \
     -DENABLE_LUAJIT=1 \
+    -DENABLE_POSTGRESQL=1 \
     -DENABLE_REDIS=1 \
     -DENABLE_SOUND=0 \
     -DENABLE_SYSTEM_GMP=1 \

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -383,16 +383,14 @@ pipeline {
                 echo "Updating Unraid template"
                 cd ${TEMPDIR}/unraid/templates/
                 GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
-                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
-                  if [[ -f ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ]]; then
-                    echo "Image is on the ignore list, marking Unraid template as deprecated"
-                    cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
-                    git add -u unraid/${CONTAINER_NAME}.xml
-                    git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
-                    git commit -m 'Bot Moving Deprecated Unraid Template' || :
-                  else
-                    echo "Image is on the ignore list, but no template exist, skipping deprecation"
-                  fi
+                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then
+                  echo "Image is on the ignore list, and already in the deprecation folder."
+                elif grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
+                  echo "Image is on the ignore list, marking Unraid template as deprecated"
+                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
+                  git add -u unraid/${CONTAINER_NAME}.xml
+                  git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
+                  git commit -m 'Bot Moving Deprecated Unraid Template' || :
                 else
                   cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                   git add unraid/${CONTAINER_NAME}.xml

diff --git a/README.md b/README.md
@@ -88,9 +88,9 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=Etc/UTC
-      - "CLI_ARGS=--gameid minetest --port 30000" #optional
+      - "CLI_ARGS=--gameid devtest" #optional
     volumes:
-      - /path/to/data:/config/.minetest
+      - /path/to/minetest/data:/config/.minetest
     ports:
       - 30000:30000/udp
     restart: unless-stopped
@@ -104,9 +104,9 @@ docker run -d \
   -e PUID=1000 \
   -e PGID=1000 \
   -e TZ=Etc/UTC \
-  -e CLI_ARGS="--gameid minetest --port 30000" `#optional` \
+  -e CLI_ARGS="--gameid devtest" `#optional` \
   -p 30000:30000/udp \
-  -v /path/to/data:/config/.minetest \
+  -v /path/to/minetest/data:/config/.minetest \
   --restart unless-stopped \
   lscr.io/linuxserver/minetest:latest
 ```
@@ -117,11 +117,11 @@ Containers are configured using parameters passed at runtime (such as those abov
 
 | Parameter | Function |
 | :----: | --- |
-| `-p 30000/udp` | Port Minetest listens on. |
+| `-p 30000/udp` | Port Minetest listens on (UDP). |
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
-| `-e CLI_ARGS=--gameid minetest --port 30000` | Optionally specify any [CLI variables](https://wiki.minetest.net/Command_line) you want to launch the app with |
+| `-e CLI_ARGS=--gameid devtest` | Optionally specify any [CLI variables](https://wiki.minetest.net/Command_line) you want to launch the app with |
 | `-v /config/.minetest` | Where minetest stores config files and maps etc. |
 
 ## Environment variables from files (Docker secrets)
@@ -285,7 +285,9 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
-* **26.01.24:** - Temporaroly pin irrlicht to continue building pending a bugfix release.
+* **12.05.24:** - Unpin irrlicht, enable IPv6 support in default conf.
+* **10.05.24:** - Enable PostgreSQL backend and fix libspatialindex branch name.
+* **26.01.24:** - Temporarily pin irrlicht to continue building pending a bugfix release.
 * **23.12.23:** - Rebase to Alpine 3.19.
 * **12.07.23:** - Rebase to Alpine 3.18, remove minetest_game.
 * **06.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)

diff --git a/readme-vars.yml b/readme-vars.yml
@@ -16,22 +16,18 @@ development_versions: false
 # container parameters
 common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
-param_usage_include_net: false
-param_usage_include_env: true
-param_env_vars:
-  - {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London."}
+
 param_usage_include_vols: true
 param_volumes:
-  - {vol_path: "/config/.minetest", vol_host_path: "/path/to/data", desc: "Where minetest stores config files and maps etc."}
+  - {vol_path: "/config/.minetest", vol_host_path: "/path/to/minetest/data", desc: "Where minetest stores config files and maps etc."}
 param_usage_include_ports: true
 param_ports:
-  - {external_port: "30000", internal_port: "30000/udp", port_desc: "Port Minetest listens on."}
-param_device_map: false
-cap_add_param: false
+  - {external_port: "30000", internal_port: "30000/udp", port_desc: "Port Minetest listens on (UDP)."}
+
 # optional container parameters
 opt_param_usage_include_env: true
 opt_param_env_vars:
-  - {env_var: "CLI_ARGS", env_value: "--gameid minetest --port 30000", desc: "Optionally specify any [CLI variables](https://wiki.minetest.net/Command_line) you want to launch the app with"}
+  - {env_var: "CLI_ARGS", env_value: "--gameid devtest", desc: "Optionally specify any [CLI variables](https://wiki.minetest.net/Command_line) you want to launch the app with"}
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
@@ -49,7 +45,9 @@ app_setup_block: |
   As per [upstream request](https://github.com/minetest/minetest/releases/tag/5.8.0) this image no longer includes [minetest_game](https://github.com/minetest/minetest_game), so if required you will need to either install via ContentDB or download it from their repo and copy to `/config/.minetest/games/minetest`
 # changelog
 changelogs:
-  - {date: "26.01.24:", desc: "Temporaroly pin irrlicht to continue building pending a bugfix release."}
+  - {date: "12.05.24:", desc: "Unpin irrlicht, enable IPv6 support in default conf."}
+  - {date: "10.05.24:", desc: "Enable PostgreSQL backend and fix libspatialindex branch name."}
+  - {date: "26.01.24:", desc: "Temporarily pin irrlicht to continue building pending a bugfix release."}
   - {date: "23.12.23:", desc: "Rebase to Alpine 3.19."}
   - {date: "12.07.23:", desc: "Rebase to Alpine 3.18, remove minetest_game."}
   - {date: "06.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}