Auto-merging via docker-versions-create

Fixed attempted rsync when WORLD not set
2026-02-17 15:13:55 +00:00 · 2020-07-11 13:13:48 -05:00 · 2020-07-11 13:09:48 -05:00 · 2020-07-10 17:11:51 -05:00 · 2020-07-04 14:58:15 -05:00 · 2020-06-20 15:45:09 -05:00
2 changed files with 3 additions and 3 deletions
--- a/4
+++ b/4
@@ -1,4 +1,4 @@
-FROM openjdk:8u212-jre-alpine
+FROM adoptopenjdk/openjdk13:alpine-jre

 LABEL maintainer "itzg"

@@ -67,7 +67,7 @@ COPY log4j2.xml /tmp/log4j2.xml
 WORKDIR /data

 ENV UID=1000 GID=1000 \
-  JVM_XX_OPTS="-XX:+UseG1GC" MEMORY="1G" \
+  MEMORY="1G" \
  TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED SPONGEBRANCH=STABLE SPONGEVERSION= FABRICVERSION=LATEST LEVEL=world \
  PVP=true DIFFICULTY=easy ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
  LEVEL_TYPE=DEFAULT SERVER_PORT=25565 ONLINE_MODE=TRUE SERVER_NAME="Dedicated Server" \
--- a/2
+++ b/2
@@ -10,7 +10,7 @@ else
  worldDest=/data/$LEVEL
 fi

-if [[ "$WORLD" ]] &&  isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ]; then
+if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] ); then
  if isURL $WORLD; then
    curl -fsSL "$WORLD" -o /tmp/world.zip
    zipSrc=/tmp/world.zip
Author	SHA1	Message	Date
Geoff Bourne	4afdb289c0	Auto-merging via docker-versions-create	2020-07-11 13:13:48 -05:00
Geoff Bourne	a07ae685e2	Fixed attempted rsync when WORLD not set	2020-07-11 13:09:48 -05:00
Geoff Bourne	fe637353d8	Auto-merging via docker-versions-create	2020-07-10 17:11:51 -05:00
Geoff Bourne	9160501f0a	Auto-merging via docker-versions-create	2020-07-04 14:58:15 -05:00
Geoff Bourne	6eba5062ec	Auto-merging via docker-versions-create	2020-06-20 15:45:09 -05:00
Geoff Bourne	fc96723db1	Auto-merging via docker-versions-create	2020-06-19 13:27:05 -05:00
Geoff Bourne	8d3e461b4c	Auto-merging via docker-versions-create	2020-05-20 08:15:12 -05:00
Geoff Bourne	fd73417411	Auto-merging via docker-versions-create	2020-05-02 09:34:30 -05:00
Geoff Bourne	1207b9a685	Auto-merging via docker-versions-create	2020-04-25 12:11:09 -05:00
Geoff Bourne	e6259bfd9d	Auto-merging via docker-versions-create	2020-04-17 21:29:12 -05:00
Geoff Bourne	b5e7b952e4	Auto-merging via docker-versions-create	2020-04-11 08:51:52 -05:00
Geoff Bourne	ac5b960182	Auto-merging via docker-versions-create	2020-04-10 11:08:59 -05:00
Geoff Bourne	3299dec733	Auto-merging via docker-versions-create	2020-04-03 13:31:44 -05:00
Geoff Bourne	578f06087f	Changed JVM_XX_OPTS to use default GC	2020-03-13 10:55:19 -05:00
Geoff Bourne	fb364e8301	Prepared adopt13 branch	2020-03-02 21:08:22 -06:00