Skip to content
This repository was archived by the owner on Jan 30, 2025. It is now read-only.

Commit 12db3f5

Browse files
authored
Merge pull request #52 from linuxserver/3.18
Rebase to 3.18
2 parents 58020b0 + 809b65a commit 12db3f5

File tree

6 files changed

+14
-34
lines changed

6 files changed

+14
-34
lines changed

Dockerfile

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:3.17
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.18
44

55
# set version label
66
ARG BUILD_DATE
@@ -119,20 +119,6 @@ RUN \
119119
mkdir -p \
120120
/defaults/games && \
121121
cp -pr /tmp/minetest/games/* /defaults/games/ && \
122-
echo "**** split after 3rd dot if it exists in minetest tag variable ****" && \
123-
echo "**** so we fetch game version x.x.x etc ****" && \
124-
if [ $(echo "$MINETEST_RELEASE" | tr -cd '.' | wc -c) = 3 ]; then \
125-
MINETEST_RELEASE=${MINETEST_RELEASE%.*}; \
126-
fi && \
127-
echo "**** fetch additional game ****" && \
128-
mkdir -p \
129-
/defaults/games/minetest && \
130-
curl -o \
131-
/tmp/minetest-game.tar.gz -L \
132-
"https://github.com/minetest/minetest_game/archive/${MINETEST_RELEASE}.tar.gz" && \
133-
tar xf \
134-
/tmp/minetest-game.tar.gz -C \
135-
/defaults/games/minetest --strip-components=1 && \
136122
echo "**** cleanup ****" && \
137123
apk del --purge \
138124
build-dependencies && \

Dockerfile.aarch64

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
3+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
44

55
# set version label
66
ARG BUILD_DATE
@@ -119,20 +119,6 @@ RUN \
119119
mkdir -p \
120120
/defaults/games && \
121121
cp -pr /tmp/minetest/games/* /defaults/games/ && \
122-
echo "**** split after 3rd dot if it exists in minetest tag variable ****" && \
123-
echo "**** so we fetch game version x.x.x etc ****" && \
124-
if [ $(echo "$MINETEST_RELEASE" | tr -cd '.' | wc -c) = 3 ]; then \
125-
MINETEST_RELEASE=${MINETEST_RELEASE%.*}; \
126-
fi && \
127-
echo "**** fetch additional game ****" && \
128-
mkdir -p \
129-
/defaults/games/minetest && \
130-
curl -o \
131-
/tmp/minetest-game.tar.gz -L \
132-
"https://github.com/minetest/minetest_game/archive/${MINETEST_RELEASE}.tar.gz" && \
133-
tar xf \
134-
/tmp/minetest-game.tar.gz -C \
135-
/defaults/games/minetest --strip-components=1 && \
136122
echo "**** cleanup ****" && \
137123
apk del --purge \
138124
build-dependencies && \

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pipeline {
3232
CI_PORT='80'
3333
CI_SSL='false'
3434
CI_DELAY='120'
35-
CI_DOCKERENV='TZ=US/Pacific'
35+
CI_DOCKERENV='TZ=Europe/London|CLI_ARGS=--gameid devtest'
3636
CI_AUTH='user:password'
3737
CI_WEBPATH=''
3838
}

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,14 @@ You can find the world maps, mods folder and config files in /config/.minetest.
6464
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;
6565
if you set your advertised port to 40000 with --port 40000 then your ports declaration should be 40000:40000/udp
6666

67-
6867
Client and server must be the same version, please browse the tags here to pull the appropriate version for your server:
6968

7069
https://hub.docker.com/r/linuxserver/minetest/tags
7170

71+
### Bundled Games
72+
73+
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`
74+
7275
## Usage
7376

7477
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
298301

299302
## Versions
300303

304+
* **12.07.23:** - Rebase to Alpine 3.18, remove minetest_game.
301305
* **06.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
302306
* **09.04.23:** - Build logic changes to copy devtest to default games.
303307
* **17.03.23:** - Fix CLI_ARGS example in readme.

jenkins-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ repo_vars:
2323
- CI_PORT='80'
2424
- CI_SSL='false'
2525
- CI_DELAY='120'
26-
- CI_DOCKERENV='TZ=US/Pacific'
26+
- CI_DOCKERENV='TZ=Europe/London|CLI_ARGS=--gameid devtest'
2727
- CI_AUTH='user:password'
2828
- CI_WEBPATH=''

readme-vars.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,16 @@ app_setup_block: |
4040
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;
4141
if you set your advertised port to 40000 with --port 40000 then your ports declaration should be 40000:40000/udp
4242
43-
4443
Client and server must be the same version, please browse the tags here to pull the appropriate version for your server:
4544
4645
https://hub.docker.com/r/linuxserver/{{ project_name }}/tags
46+
47+
### Bundled Games
48+
49+
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`
4750
# changelog
4851
changelogs:
52+
- {date: "12.07.23:", desc: "Rebase to Alpine 3.18, remove minetest_game."}
4953
- {date: "06.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
5054
- {date: "09.04.23:", desc: "Build logic changes to copy devtest to default games."}
5155
- {date: "17.03.23:", desc: "Fix CLI_ARGS example in readme."}

0 commit comments

Comments
 (0)