Merging latest from master

Auto-merging via docker-versions-create
Merge branch 'master' of github.com:itzg/docker-minecraft-server
2026-04-04 04:38:52 +00:00 · 2021-12-12 09:19:48 -06:00 · 2021-12-11 16:25:35 -06:00 · 2021-12-11 16:23:25 -06:00 · 2021-12-11 16:09:15 -06:00 · 2021-12-10 21:05:35 -06:00
3 changed files with 15 additions and 19 deletions
--- a/2
+++ b/2
@@ -60,7 +60,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
 --var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \
 --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz

-ARG MC_HELPER_VERSION=1.11.0
+ARG MC_HELPER_VERSION=1.10.0
 ARG MC_HELPER_BASE_URL=https://github.com/itzg/mc-image-helper/releases/download/v${MC_HELPER_VERSION}
 RUN curl -fsSL ${MC_HELPER_BASE_URL}/mc-image-helper-${MC_HELPER_VERSION}.tgz \
    | tar -C /usr/share -zxf - \
--- a/README.md
+++ b/README.md
@@ -275,7 +275,7 @@ When using the image `itzg:/minecraft-server` without a tag, the `latest` image

 | Tag name       | Java version | Linux  | JVM Type | Architecture      |
 | -------------- | -------------|--------|----------|-------------------|
-| latest         | 17           | Debian | Hotspot  | amd64,arm64,armv7 |
+| latest         | 16           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java8          | 8            | Alpine | Hotspot  | amd64             |
 | java8-multiarch | 8           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java8-openj9   | 8            | Debian | OpenJ9   | amd64             |
--- a/scripts/start-deployFabric
+++ b/scripts/start-deployFabric
@@ -2,31 +2,27 @@
 set -eu

 # shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
+. ${SCRIPTS:-/}start-utils

 requireVar VANILLA_VERSION
 export TYPE=FABRIC
-: "${FABRIC_INSTALLER_VERSION:=${FABRICVERSION:-LATEST}}"
-: "${FABRIC_INSTALLER:=}"
-: "${FABRIC_INSTALLER_URL:=}"
-: "${FABRIC_LOADER_VERSION:=LATEST}"
+export SERVER=fabric-server-${VANILLA_VERSION}.jar

 isDebugging && set -x

-log "Checking Fabric version information."
-if [[ $FABRIC_INSTALLER ]]; then
-  FABRIC_INSTALLER_VERSION=$(echo -n "$FABRIC_INSTALLER" | mc-image-helper hash)
-elif [[ $FABRIC_INSTALLER_URL ]]; then
-  FABRIC_INSTALLER_VERSION=$(echo -n "$FABRIC_INSTALLER_URL" | mc-image-helper hash)
-elif [[ ${FABRIC_INSTALLER_VERSION^^} = LATEST ]]; then
-  FABRIC_INSTALLER_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml)
-fi
-
-export SERVER=fabric-server-${VANILLA_VERSION}-${FABRIC_INSTALLER_VERSION}.jar
-
 if [[ ! -e ${SERVER} ]]; then

+  : ${FABRIC_INSTALLER:=}
+  : ${FABRIC_INSTALLER_URL:=}
+  : ${FABRIC_LOADER_VERSION:=LATEST}
+  : ${FABRIC_INSTALLER_VERSION:=${FABRICVERSION:-LATEST}}
+
  if [[ -z $FABRIC_INSTALLER && -z $FABRIC_INSTALLER_URL ]]; then
+    log "Checking Fabric version information."
+    if [[ ${FABRIC_INSTALLER_VERSION^^} = LATEST ]]; then
+      FABRIC_INSTALLER_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml)
+    fi
+
    FABRIC_INSTALLER="fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
    FABRIC_INSTALLER_URL="https://maven.fabricmc.net/net/fabricmc/fabric-installer/${FABRIC_INSTALLER_VERSION}/fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
  elif [[ -z $FABRIC_INSTALLER ]]; then
@@ -74,4 +70,4 @@ if [[ ! -e ${SERVER} ]]; then
 fi

 export FAMILY=FABRIC
-exec "${SCRIPTS:-/}start-setupWorld" "$@"
+exec ${SCRIPTS:-/}start-setupWorld "$@"
Author	SHA1	Message	Date
Geoff Bourne	3a31ce757d	Merging latest from master	2021-12-12 09:19:48 -06:00
Geoff Bourne	be2ef20fc1	Auto-merging via docker-versions-create	2021-12-11 16:25:35 -06:00
Geoff Bourne	3f2022da40	Merge branch 'master' of github.com:itzg/docker-minecraft-server	2021-12-11 16:23:25 -06:00
Geoff Bourne	0f7464403c	build: added github release creation step to docker-versions-create.sh	2021-12-11 16:09:15 -06:00
Geoff Bourne	6020400d3b	Auto-merging via docker-versions-create	2021-12-10 21:05:35 -06:00
Geoff Bourne	ae96adaeec	Auto-merging via docker-versions-create	2021-12-10 10:43:14 -06:00
Geoff Bourne	d34be9f20e	Auto-merging via docker-versions-create	2021-12-10 07:58:31 -06:00
Geoff Bourne	64a02d28bc	Auto-merging via docker-versions-create	2021-12-06 22:06:58 -06:00
Geoff Bourne	c446cb11da	Auto-merging via docker-versions-create	2021-12-04 10:00:59 -06:00
Geoff Bourne	7aea5b593e	Auto-merging via docker-versions-create	2021-12-02 19:47:40 -06:00
Geoff Bourne	91adfaa1d9	Auto-merging via docker-versions-create	2021-11-24 15:58:26 -06:00
Geoff Bourne	e7b223f1c6	Auto-merging via docker-versions-create	2021-11-24 14:35:16 -06:00
Geoff Bourne	45eff98011	Track latest from master	2021-11-16 19:02:53 -06:00
Geoff Bourne	b4111f0428	Auto-merging via docker-versions-create	2021-11-16 18:52:49 -06:00
Geoff Bourne	288bdf3804	Auto-merging via docker-versions-create	2021-11-15 20:49:35 -06:00
Geoff Bourne	5bc1ac672e	Auto-merging via docker-versions-create	2021-11-13 19:18:44 -06:00
Geoff Bourne	a503ad2ec2	Auto-merging via docker-versions-create	2021-11-13 18:53:18 -06:00
Geoff Bourne	3042aa4909	Auto-merging via docker-versions-create	2021-11-12 21:25:05 -06:00
Geoff Bourne	8882ae5f89	Auto-merging via docker-versions-create	2021-11-06 21:41:15 -05:00
Geoff Bourne	4149db7f11	Auto-merging via docker-versions-create	2021-11-04 21:08:06 -05:00
Geoff Bourne	666f538ad5	Auto-merging via docker-versions-create	2021-10-31 09:49:21 -05:00
Geoff Bourne	145403ea54	Merge branch 'master' into java17	2021-10-27 21:28:49 -05:00
Geoff Bourne	5392801ecd	Auto-merging via docker-versions-create	2021-10-25 19:26:48 -05:00
Geoff Bourne	3dfd70d068	Auto-merging via docker-versions-create	2021-10-24 20:31:59 -05:00
Geoff Bourne	e5bc9b939f	Auto-merging via docker-versions-create	2021-10-23 09:47:31 -05:00
Geoff Bourne	1b620d2d6d	Auto-merging via docker-versions-create	2021-10-22 15:57:41 -05:00
Geoff Bourne	28d77853cb	Added java17 variant #1054	2021-10-19 21:34:02 -05:00