Add property mapping for force-gamemode (#406)

Also
* Updated box64 package structure
This commit is contained in:
Geoff Bourne authored and GitHub committed 2024-04-03 22:29:25 -05:00
1 parent f28c5a2d8a
commit fc68969c4b
5 files changed
+40 -19

No files matched your search

+3 -19
View File
@@ -6,26 +6,10 @@ ARG TARGETOS
ARG TARGETARCH ARG TARGETARCH
ARG TARGETVARIANT ARG TARGETVARIANT
RUN apt-get update && \ RUN --mount=target=/build,source=build /build/install-packages
DEBIAN_FRONTEND=noninteractive apt-get install -y \
curl \
openssl \
unzip \
jq \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
# Install box64 on arm ARG BOX64_PACKAGE=box64
RUN if [ "$TARGETARCH" = "arm64" ] ; then \ RUN --mount=target=/build,source=build BOX64_PACKAGE=$BOX64_PACKAGE /build/setup-arm64
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y debian-keyring && \
curl -L https://ryanfortner.github.io/box64-debs/box64.list -o /etc/apt/sources.list.d/box64.list && \
curl -L https://ryanfortner.github.io/box64-debs/KEY.gpg | gpg --dearmor | tee /etc/apt/trusted.gpg.d/box64-debs-archive-keyring.gpg && \
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y box64-arm64 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* ;\
fi
EXPOSE 19132/udp EXPOSE 19132/udp
+1
View File
@@ -58,6 +58,7 @@ The following environment variables will set the equivalent property in `server.
- `SERVER_PORT` - `SERVER_PORT`
- `SERVER_PORT_V6` - `SERVER_PORT_V6`
- `GAMEMODE` - `GAMEMODE`
- `FORCE_GAMEMODE`
- `DIFFICULTY` - `DIFFICULTY`
- `LEVEL_TYPE` - `LEVEL_TYPE`
- `ALLOW_CHEATS` - `ALLOW_CHEATS`
+15
View File
@@ -0,0 +1,15 @@
#!/bin/sh
set -eu
apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -y \
curl \
openssl \
unzip \
jq
apt-get clean
rm -rf /var/lib/apt/lists/*
+17
View File
@@ -0,0 +1,17 @@
#!/bin/sh
set -eu
if [ "$TARGETARCH" = "arm64" ] ; then
apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -y debian-keyring
curl -L https://ryanfortner.github.io/box64-debs/box64.list -o /etc/apt/sources.list.d/box64.list
curl -L https://ryanfortner.github.io/box64-debs/KEY.gpg | gpg --dearmor | tee /etc/apt/trusted.gpg.d/box64-debs-archive-keyring.gpg
apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -y "$BOX64_PACKAGE"
apt-get clean
rm -rf /var/lib/apt/lists/*
fi
+4
View File
@@ -17,6 +17,10 @@
"2": "adventure" "2": "adventure"
} }
}, },
"force-gamemode": {
"env": "FORCE_GAMEMODE",
"allowed": ["true","false"]
},
"difficulty": { "difficulty": {
"env": "DIFFICULTY", "env": "DIFFICULTY",
"allowed": ["easy","peaceful","normal","hard"], "allowed": ["easy","peaceful","normal","hard"],