Add support for SSH remote console (#388)

This commit is contained in:
Kaiede authored and GitHub committed 2024-01-06 15:58:37 -06:00
1 parent e3a35861ec
commit d04be8693a
2 files changed
+26 -4

No files matched your search

+8 -2
View File
@@ -9,19 +9,20 @@ ARG TARGETVARIANT
RUN apt-get update && \ RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \ DEBIAN_FRONTEND=noninteractive apt-get install -y \
curl \ curl \
openssl \
unzip \ unzip \
jq \ jq \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Instal box64 on arm # Install box64 on arm
RUN if [ "$TARGETARCH" = "arm64" ] ; then \ RUN if [ "$TARGETARCH" = "arm64" ] ; then \
apt-get update && \ apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y debian-keyring && \ 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/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 && \ 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 && \ apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y box64-generic-arm \ DEBIAN_FRONTEND=noninteractive apt-get install -y box64-arm64 \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* ;\ && rm -rf /var/lib/apt/lists/* ;\
fi fi
@@ -57,6 +58,11 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
--var version=${MC_MONITOR_VERSION} --var app=mc-monitor --file {{.app}} \ --var version=${MC_MONITOR_VERSION} --var app=mc-monitor --file {{.app}} \
--from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
ARG MC_SERVER_RUNNER_VERSION=1.10.0
RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
--var version=${MC_SERVER_RUNNER_VERSION} --var app=mc-server-runner --file {{.app}} \
--from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
COPY *.sh /opt/ COPY *.sh /opt/
COPY property-definitions.json /etc/bds-property-definitions.json COPY property-definitions.json /etc/bds-property-definitions.json
+18 -2
View File
@@ -50,6 +50,8 @@ if [[ ${DEBUG^^} == TRUE ]]; then
echo " current directory is $(pwd)" echo " current directory is $(pwd)"
fi fi
export HOME=/data
downloadPage=https://www.minecraft.net/en-us/download/server/bedrock downloadPage=https://www.minecraft.net/en-us/download/server/bedrock
if [[ ${EULA^^} != TRUE ]]; then if [[ ${EULA^^} != TRUE ]]; then
@@ -190,9 +192,23 @@ set-property --file server.properties --bulk /etc/bds-property-definitions.json
export LD_LIBRARY_PATH=. export LD_LIBRARY_PATH=.
mcServerRunnerArgs=()
if isTrue "${ENABLE_SSH}"; then
mcServerRunnerArgs+=(--remote-console)
if ! [[ -v RCON_PASSWORD ]]; then
RCON_PASSWORD=$(openssl rand -hex 12)
export RCON_PASSWORD
fi
# For ssh access by tools, export the current password.
# Use rcon's format to align with Java, as Java uses the rcon password for SSH as well.
echo "password=${RCON_PASSWORD}" > "$HOME/.remote-console.env"
echo "password: \"${RCON_PASSWORD}\"" > "$HOME/.remote-console.yaml"
fi
echo "Starting Bedrock server..." echo "Starting Bedrock server..."
if [[ -f /usr/local/bin/box64 ]] ; then if [[ -f /usr/local/bin/box64 ]] ; then
exec box64 ./"bedrock_server-${VERSION}" exec mc-server-runner "${mcServerRunnerArgs[@]}" box64 ./"bedrock_server-${VERSION}"
else else
exec ./"bedrock_server-${VERSION}" exec mc-server-runner "${mcServerRunnerArgs[@]}" ./"bedrock_server-${VERSION}"
fi fi