mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-07-31 04:35:57 +00:00
Compare commits
10
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fbb2a0d8d7 | ||
|
|
ee562599f4 | ||
|
|
1ffcb5c221 | ||
|
|
8cdf4d0072 | ||
|
|
1545236cc6 | ||
|
|
2ebcc0fe00 | ||
|
|
e5f818bdf1 | ||
|
|
df497ce3d8 | ||
|
|
f7ff2779d9 | ||
|
|
c9e14864f5 |
+16
-9
@@ -1,6 +1,19 @@
|
|||||||
# syntax = docker/dockerfile:1.3
|
# syntax = docker/dockerfile:1.5-labs
|
||||||
|
|
||||||
ARG BASE_IMAGE=eclipse-temurin:17-jre-focal
|
ARG BASE_IMAGE=eclipse-temurin:17-jre-focal
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
FROM container-registry.oracle.com/graalvm/native-image:21-ol8 AS helper-native-builder
|
||||||
|
|
||||||
|
# findutils provides xargs, needed by gradle wrapper
|
||||||
|
RUN microdnf install findutils
|
||||||
|
|
||||||
|
ADD https://github.com/itzg/mc-image-helper.git#feat/graalvm /helper
|
||||||
|
|
||||||
|
WORKDIR /helper
|
||||||
|
|
||||||
|
RUN ./gradlew nativeCompile
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
FROM ${BASE_IMAGE}
|
FROM ${BASE_IMAGE}
|
||||||
|
|
||||||
# hook into docker BuildKit --platform support
|
# hook into docker BuildKit --platform support
|
||||||
@@ -42,13 +55,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
|
|||||||
--var version=1.9.0 --var app=mc-server-runner --file {{.app}} \
|
--var version=1.9.0 --var app=mc-server-runner --file {{.app}} \
|
||||||
--from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
|
--from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
|
||||||
|
|
||||||
ARG MC_HELPER_VERSION=1.36.1
|
COPY --from=helper-native-builder /helper/build/native/nativeCompile/mc-image-helper /usr/bin/
|
||||||
ARG MC_HELPER_BASE_URL=https://github.com/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
|
|
||||||
# used for cache busting local copy of mc-image-helper
|
|
||||||
ARG MC_HELPER_REV=1
|
|
||||||
RUN curl -fsSL ${MC_HELPER_BASE_URL}/mc-image-helper-${MC_HELPER_VERSION}.tgz \
|
|
||||||
| tar -C /usr/share -zxf - \
|
|
||||||
&& ln -s /usr/share/mc-image-helper-${MC_HELPER_VERSION}/bin/mc-image-helper /usr/bin
|
|
||||||
|
|
||||||
VOLUME ["/data"]
|
VOLUME ["/data"]
|
||||||
WORKDIR /data
|
WORKDIR /data
|
||||||
|
|||||||
@@ -24,9 +24,9 @@ renders
|
|||||||
|
|
||||||

|

|
||||||
|
|
||||||
To produce a multi-line MOTD, you will need to double escape the newline such as
|
To produce a multi-line MOTD, embed a newline character as `\n` in the string, such as
|
||||||
|
|
||||||
-e MOTD="Line one\\nLine two"
|
-e MOTD="Line one\nLine two"
|
||||||
|
|
||||||
### Difficulty
|
### Difficulty
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
mkdocs == 1.5.3
|
mkdocs == 1.5.3
|
||||||
mkdocs-material-extensions == 1.2
|
mkdocs-material-extensions == 1.2
|
||||||
mkdocs-material == 9.4.3
|
mkdocs-material == 9.4.6
|
||||||
mkdocs-autorefs == 0.5.0
|
mkdocs-autorefs == 0.5.0
|
||||||
mkdocstrings == 0.23.0
|
mkdocstrings == 0.23.0
|
||||||
mkdocs-literate-nav == 0.6.1
|
mkdocs-literate-nav == 0.6.1
|
||||||
mdx-gh-links == 0.3.1
|
mdx-gh-links == 0.3.1
|
||||||
mkdocs-click == 0.8.1
|
mkdocs-click == 0.8.1
|
||||||
mkdocs-static-i18n == 1.0.6
|
mkdocs-static-i18n == 1.1.1
|
||||||
@@ -239,10 +239,7 @@ function handleModrinthProjects() {
|
|||||||
if [[ $MODRINTH_PROJECTS ]] && isFamily HYBRID FORGE FABRIC SPIGOT; then
|
if [[ $MODRINTH_PROJECTS ]] && isFamily HYBRID FORGE FABRIC SPIGOT; then
|
||||||
if isFamily HYBRID FORGE; then
|
if isFamily HYBRID FORGE; then
|
||||||
loader=forge
|
loader=forge
|
||||||
elif isFamily FABRIC; then
|
|
||||||
loader=fabric
|
|
||||||
else
|
else
|
||||||
# we're left with Bukkit/Spigot down-lines where plugins seem to be
|
|
||||||
loader="${TYPE,,}"
|
loader="${TYPE,,}"
|
||||||
fi
|
fi
|
||||||
mc-image-helper modrinth \
|
mc-image-helper modrinth \
|
||||||
|
|||||||
@@ -5,6 +5,10 @@ IFS=$'\n\t'
|
|||||||
: "${EXISTING_OPS_FILE:=SKIP}"
|
: "${EXISTING_OPS_FILE:=SKIP}"
|
||||||
: "${EXISTING_WHITELIST_FILE:=SKIP}"
|
: "${EXISTING_WHITELIST_FILE:=SKIP}"
|
||||||
|
|
||||||
|
# shellcheck source=start-utils
|
||||||
|
. "${SCRIPTS:-/}start-utils"
|
||||||
|
isDebugging && set -x
|
||||||
|
|
||||||
if [[ -v APPEND_OPS ]] && isTrue "${APPEND_OPS}"; then
|
if [[ -v APPEND_OPS ]] && isTrue "${APPEND_OPS}"; then
|
||||||
EXISTING_OPS_FILE=MERGE
|
EXISTING_OPS_FILE=MERGE
|
||||||
elif [[ -v OVERRIDE_OPS ]] && isTrue "${OVERRIDE_OPS}"; then
|
elif [[ -v OVERRIDE_OPS ]] && isTrue "${OVERRIDE_OPS}"; then
|
||||||
@@ -17,10 +21,6 @@ elif [[ -v OVERRIDE_WHITELIST ]] && isTrue "${OVERRIDE_WHITELIST}"; then
|
|||||||
EXISTING_WHITELIST_FILE=SYNCHRONIZE
|
EXISTING_WHITELIST_FILE=SYNCHRONIZE
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# shellcheck source=start-utils
|
|
||||||
. "${SCRIPTS:-/}start-utils"
|
|
||||||
isDebugging && set -x
|
|
||||||
|
|
||||||
sharedArgs=(--version="$VERSION")
|
sharedArgs=(--version="$VERSION")
|
||||||
if isFalse "${ONLINE_MODE:-true}"; then
|
if isFalse "${ONLINE_MODE:-true}"; then
|
||||||
sharedArgs+=( --offline )
|
sharedArgs+=( --offline )
|
||||||
|
|||||||
@@ -28,9 +28,6 @@ function customizeServerProps {
|
|||||||
MOTD="{\"text\":\"${MOTD}\"}"
|
MOTD="{\"text\":\"${MOTD}\"}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if [[ $MOTD ]]; then
|
|
||||||
MOTD="$(echo "$MOTD" | mc-image-helper asciify)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -v MODE ]]; then
|
if [[ -v MODE ]]; then
|
||||||
log "Setting mode"
|
log "Setting mode"
|
||||||
|
|||||||
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Executable
+1
@@ -0,0 +1 @@
|
|||||||
|
[[ $EXTENDED_TESTS ]] || exit 1
|
||||||
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Reference in New Issue
Block a user