Merge pull request #52 from linuxserver/3.18

Rebase to 3.18

Author: aptalca

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.17
+FROM ghcr.io/linuxserver/baseimage-alpine:3.18
 
 # set version label
 ARG BUILD_DATE
@@ -119,20 +119,6 @@ RUN \
   mkdir -p \
     /defaults/games && \
   cp -pr  /tmp/minetest/games/* /defaults/games/ && \
-  echo "**** split after 3rd dot if it exists in minetest tag variable ****" && \
-  echo "**** so we fetch game version x.x.x etc ****" && \
-  if [ $(echo "$MINETEST_RELEASE" | tr -cd '.' | wc -c) = 3 ]; then \
-    MINETEST_RELEASE=${MINETEST_RELEASE%.*}; \
-  fi && \
-  echo "**** fetch additional game ****" && \
-  mkdir -p \
-    /defaults/games/minetest && \
-  curl -o \
-    /tmp/minetest-game.tar.gz -L \
-    "https://github.com/minetest/minetest_game/archive/${MINETEST_RELEASE}.tar.gz" && \
-  tar xf \
-    /tmp/minetest-game.tar.gz -C \
-    /defaults/games/minetest --strip-components=1 && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
 
 # set version label
 ARG BUILD_DATE
@@ -119,20 +119,6 @@ RUN \
   mkdir -p \
     /defaults/games && \
   cp -pr  /tmp/minetest/games/* /defaults/games/ && \
-  echo "**** split after 3rd dot if it exists in minetest tag variable ****" && \
-  echo "**** so we fetch game version x.x.x etc ****" && \
-  if [ $(echo "$MINETEST_RELEASE" | tr -cd '.' | wc -c) = 3 ]; then \
-    MINETEST_RELEASE=${MINETEST_RELEASE%.*}; \
-  fi && \
-  echo "**** fetch additional game ****" && \
-  mkdir -p \
-    /defaults/games/minetest && \
-  curl -o \
-    /tmp/minetest-game.tar.gz -L \
-    "https://github.com/minetest/minetest_game/archive/${MINETEST_RELEASE}.tar.gz" && \
-  tar xf \
-    /tmp/minetest-game.tar.gz -C \
-    /defaults/games/minetest --strip-components=1 && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \

Jenkinsfile

@@ -32,7 +32,7 @@ pipeline {
     CI_PORT='80'
     CI_SSL='false'
     CI_DELAY='120'
-    CI_DOCKERENV='TZ=US/Pacific'
+    CI_DOCKERENV='TZ=Europe/London|CLI_ARGS=--gameid devtest'
     CI_AUTH='user:password'
     CI_WEBPATH=''
   }

README.md

@@ -64,11 +64,14 @@ You can find the world maps, mods folder and config files in /config/.minetest.
 If you want to override the advertised port, ensure you add --port in your CLI_ARGS AND ensure the internal port reflects the change, ie;
 if you set your advertised port to 40000 with --port 40000 then your ports declaration should be 40000:40000/udp
 
-
 Client and server must be the same version, please browse the tags here to pull the appropriate version for your server:
 
 https://hub.docker.com/r/linuxserver/minetest/tags
 
+### Bundled Games
+
+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`
+
 ## Usage
 
 To help you get started creating a container from this image you can either use docker-compose or the docker cli.
@@ -298,6 +301,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **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)
 * **09.04.23:** - Build logic changes to copy devtest to default games.
 * **17.03.23:** - Fix CLI_ARGS example in readme.

jenkins-vars.yml

@@ -23,6 +23,6 @@ repo_vars:
   - CI_PORT='80'
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
+  - CI_DOCKERENV='TZ=Europe/London|CLI_ARGS=--gameid devtest'
   - CI_AUTH='user:password'
   - CI_WEBPATH=''

readme-vars.yml

@@ -40,12 +40,16 @@ app_setup_block: |
   If you want to override the advertised port, ensure you add --port in your CLI_ARGS AND ensure the internal port reflects the change, ie;
   if you set your advertised port to 40000 with --port 40000 then your ports declaration should be 40000:40000/udp
 
-
   Client and server must be the same version, please browse the tags here to pull the appropriate version for your server:
 
   https://hub.docker.com/r/linuxserver/{{ project_name }}/tags
+
+  ### Bundled Games
+
+  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: "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)"}
   - {date: "09.04.23:", desc: "Build logic changes to copy devtest to default games."}
   - {date: "17.03.23:", desc: "Fix CLI_ARGS example in readme."}