Rebase to 3.20

linuxserver · Jun 1, 2024 · 07df3e4 · 07df3e4
1 parent ab5f587
commit 07df3e4
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:3.20
 
 # set version label
 ARG BUILD_DATE
@@ -126,6 +126,7 @@ RUN \
   mkdir -p \
     /defaults/games && \
   cp -pr  /tmp/minetest/games/* /defaults/games/ && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
 
 # set version label
 ARG BUILD_DATE
@@ -126,6 +126,7 @@ RUN \
   mkdir -p \
     /defaults/games && \
   cp -pr  /tmp/minetest/games/* /defaults/games/ && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -33,8 +33,8 @@ pipeline {
     CI_PORT='80'
     CI_SSL='false'
     CI_DELAY='120'
-    CI_DOCKERENV='TZ=Europe/London|CLI_ARGS=--gameid devtest'
-    CI_AUTH='user:password'
+    CI_DOCKERENV='CLI_ARGS=--gameid devtest'
+    CI_AUTH=''
     CI_WEBPATH=''
   }
   stages {

diff --git a/README.md b/README.md
@@ -285,6 +285,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **01.06.24:** - Rebase to Alpine 3.20.
 * **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.

diff --git a/jenkins-vars.yml b/jenkins-vars.yml
@@ -23,6 +23,6 @@ repo_vars:
   - CI_PORT='80'
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=Europe/London|CLI_ARGS=--gameid devtest'
-  - CI_AUTH='user:password'
+  - CI_DOCKERENV='CLI_ARGS=--gameid devtest'
+  - CI_AUTH=''
   - CI_WEBPATH=''
diff --git a/readme-vars.yml b/readme-vars.yml
@@ -11,15 +11,14 @@ project_blurb_optional_extras_enabled: false
 available_architectures:
   - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
   - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
-# development version
-development_versions: false
+
 # container parameters
 common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
 
 param_usage_include_vols: true
 param_volumes:
-  - {vol_path: "/config/.minetest", vol_host_path: "/path/to/minetest/data", desc: "Where minetest stores config files and maps etc."}
+  - {vol_path: "/config/.minetest", vol_host_path: "/path/to/{{ project_name }}/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 (UDP)."}
@@ -45,6 +44,7 @@ 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: "01.06.24:", desc: "Rebase to Alpine 3.20."}
   - {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."}