Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase to 3.20 #61

Merged
merged 1 commit into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 && \
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.aarch64
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions jenkins-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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=''
6 changes: 3 additions & 3 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)."}
Expand All @@ -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."}
Expand Down