Auto-merging via docker-versions-create

revert: Should have been added to master
ci: Added adopt15 branch releases
2026-02-21 16:46:23 +00:00 · 2020-12-15 14:00:18 -06:00 · 2020-12-07 10:53:47 -06:00 · 2020-12-07 10:52:37 -06:00 · 2020-12-07 10:51:10 -06:00
1 changed files with 2 additions and 2 deletions
--- a/4
+++ b/4
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk13:alpine-jre
+FROM adoptopenjdk/openjdk15:alpine-jre

 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"

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

 ENV UID=1000 GID=1000 \
-  MEMORY="1G" \
+  JVM_XX_OPTS="-XX:+UseG1GC" 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" \
Author	SHA1	Message	Date
Geoff Bourne	65fa25b3b3	Auto-merging via docker-versions-create	2020-12-15 14:00:18 -06:00
Geoff Bourne	46272296d2	revert: Should have been added to master	2020-12-07 10:53:47 -06:00
Geoff Bourne	008bbb3aff	ci: Added adopt15 branch releases	2020-12-07 10:52:37 -06:00
Bartosz Stefańczyk	882fe89caf	Java 15 support (#679 )	2020-12-07 10:51:10 -06:00