mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-03-27 08:52:45 +00:00
Compare commits
5 Commits
2026.3.2
...
feat/cf-sm
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
22fc2ff79a | ||
|
|
5b9c09b7b2 | ||
|
|
b37c2cc3ef | ||
|
|
3cd3656868 | ||
|
|
387c674849 |
6
.github/workflows/build.yml
vendored
6
.github/workflows/build.yml
vendored
@@ -55,15 +55,15 @@ jobs:
|
|||||||
- variant: java21
|
- variant: java21
|
||||||
baseImage: eclipse-temurin:21-jre
|
baseImage: eclipse-temurin:21-jre
|
||||||
platforms: linux/amd64,linux/arm64
|
platforms: linux/amd64,linux/arm64
|
||||||
mcVersion: latest
|
mcVersion: 1.21.11
|
||||||
- variant: java21-jdk
|
- variant: java21-jdk
|
||||||
baseImage: eclipse-temurin:21
|
baseImage: eclipse-temurin:21
|
||||||
platforms: linux/amd64,linux/arm64
|
platforms: linux/amd64,linux/arm64
|
||||||
mcVersion: latest
|
mcVersion: 1.21.11
|
||||||
- variant: java21-alpine
|
- variant: java21-alpine
|
||||||
baseImage: eclipse-temurin:21-jre-alpine
|
baseImage: eclipse-temurin:21-jre-alpine
|
||||||
platforms: linux/amd64,linux/arm64
|
platforms: linux/amd64,linux/arm64
|
||||||
mcVersion: latest
|
mcVersion: 1.21.11
|
||||||
# JAVA 17:
|
# JAVA 17:
|
||||||
- variant: java17
|
- variant: java17
|
||||||
# jammy doesn't work until minecraft updates to https://github.com/netty/netty/issues/12343
|
# jammy doesn't work until minecraft updates to https://github.com/netty/netty/issues/12343
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
|
|||||||
--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
|
||||||
|
|
||||||
# renovate: datasource=github-releases packageName=itzg/mc-image-helper versioning=loose
|
# renovate: datasource=github-releases packageName=itzg/mc-image-helper versioning=loose
|
||||||
ARG MC_HELPER_VERSION=1.55.2
|
ARG MC_HELPER_VERSION=1.55.4
|
||||||
ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
|
ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
|
||||||
# used for cache busting local copy of mc-image-helper
|
# used for cache busting local copy of mc-image-helper
|
||||||
ARG MC_HELPER_REV=1
|
ARG MC_HELPER_REV=1
|
||||||
|
|||||||
@@ -397,6 +397,12 @@ This image maps known server properties as described in [this section](configura
|
|||||||
<td><code>Randomly generated</code></td>
|
<td><code>Randomly generated</code></td>
|
||||||
<td>✅</td>
|
<td>✅</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><code>RCON_PASSWORD_FILE</code></td>
|
||||||
|
<td>Can be set to read the RCON password from a file. Overrides <code>RCON_PASSWORD</code> if both are set.</td>
|
||||||
|
<td><code></code></td>
|
||||||
|
<td>⬜️</td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><code>RCON_PORT</code></td>
|
<td><code>RCON_PORT</code></td>
|
||||||
<td>The port for RCON</td>
|
<td>The port for RCON</td>
|
||||||
|
|||||||
@@ -144,6 +144,7 @@
|
|||||||
"smart-hud",
|
"smart-hud",
|
||||||
"smithing-template-viewer",
|
"smithing-template-viewer",
|
||||||
"smooth-font",
|
"smooth-font",
|
||||||
|
"smooth-swapping",
|
||||||
"smoothwater",
|
"smoothwater",
|
||||||
"sodium",
|
"sodium",
|
||||||
"sodium-extra",
|
"sodium-extra",
|
||||||
|
|||||||
@@ -94,6 +94,7 @@
|
|||||||
"seasonhud",
|
"seasonhud",
|
||||||
"ShoulderSurfing",
|
"ShoulderSurfing",
|
||||||
"skinlayers3d",
|
"skinlayers3d",
|
||||||
|
"smoothswapping",
|
||||||
"sodium",
|
"sodium",
|
||||||
"sorted_enchantments",
|
"sorted_enchantments",
|
||||||
"tooltipfix",
|
"tooltipfix",
|
||||||
|
|||||||
@@ -156,7 +156,11 @@ export DECLARED_TYPE=${TYPE^^}
|
|||||||
export DECLARED_VERSION="$VERSION"
|
export DECLARED_VERSION="$VERSION"
|
||||||
|
|
||||||
if isTrue "${VERSION_FROM_MODRINTH_PROJECTS:-}" && [[ ${MODRINTH_PROJECTS:-} ]]; then
|
if isTrue "${VERSION_FROM_MODRINTH_PROJECTS:-}" && [[ ${MODRINTH_PROJECTS:-} ]]; then
|
||||||
if ! VERSION=$(mc-image-helper version-from-modrinth-projects --projects "${MODRINTH_PROJECTS}"); then
|
args=()
|
||||||
|
if [[ ${MODRINTH_PROJECTS_DEFAULT_VERSION_TYPE:-} ]]; then
|
||||||
|
args+=(--allowed-version-type "${MODRINTH_PROJECTS_DEFAULT_VERSION_TYPE:-}")
|
||||||
|
fi
|
||||||
|
if ! VERSION=$(mc-image-helper version-from-modrinth-projects "${args[@]}" --projects "${MODRINTH_PROJECTS}"); then
|
||||||
logError "failed to resolve version from MODRINTH_PROJECTS: ${MODRINTH_PROJECTS}"
|
logError "failed to resolve version from MODRINTH_PROJECTS: ${MODRINTH_PROJECTS}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user