Auto-merging via docker-versions-create

Added git
#819
2026-03-20 13:35:58 +00:00 · 2021-04-01 16:41:19 -05:00 · 2021-04-01 16:29:22 -05:00 · 2021-03-06 16:28:10 -06:00 · 2021-03-06 16:07:04 -06:00 · 2021-03-06 11:44:05 -06:00
2 changed files with 3 additions and 3 deletions
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:15-jre
+FROM adoptopenjdk:latest
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
--- a/4
+++ b/4
@@ -99,7 +99,7 @@ case "${TYPE^^}" in
  FORGE)
    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
+    log "WARNING: The image tag itzg/minecraft-server:java8-multiarch is recommended"
    log "         since some mods require Java 8"
    log "         Exception traces reporting ClassCastException: class jdk.internal.loader.ClassLoaders\$AppClassLoader"
    log "         can be fixed with java8"
@@ -117,7 +117,7 @@ case "${TYPE^^}" in
  FTB|CURSEFORGE)
    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
+    log "WARNING: The image tag itzg/minecraft-server:java8-multiarch is recommended"
    log "         since some mods require Java 8"
    log "         Exception traces reporting ClassCastException: class jdk.internal.loader.ClassLoaders\$AppClassLoader"
    log "         can be fixed with java8"
Author	SHA1	Message	Date
Geoff Bourne	f6ce093a9f	Auto-merging via docker-versions-create	2021-04-01 16:41:19 -05:00
Geoff Bourne	b754ce7ed4	Added git #819	2021-04-01 16:29:22 -05:00
Geoff Bourne	26e75f29ba	Merge branch 'master' into multiarch-latest	2021-03-06 16:28:10 -06:00
Geoff Bourne	43b090019d	Shifted PATH-fix earlier in startup	2021-03-06 16:07:04 -06:00
Geoff Bourne	a9fec728e1	Ensure FTBA version.json is readable #784	2021-03-06 11:44:05 -06:00
Geoff Bourne	e22dfa898d	Auto-merging via docker-versions-create	2021-02-27 20:56:33 -06:00
Geoff Bourne	c353752c0c	Merge branch 'master' into multiarch-latest	2021-02-10 14:59:41 -06:00
Geoff Bourne	b566c82892	Auto-merging via docker-versions-create	2021-02-10 14:09:30 -06:00
Geoff Bourne	a4abb22690	Merge branch 'master' into multiarch-latest # Conflicts: # start-configuration	2021-02-08 21:28:46 -06:00
Geoff Bourne	6a9551fafe	Auto-merging via docker-versions-create CONFLICT (content): Merge conflict in Dockerfile	2021-02-07 18:23:57 -06:00
Geoff Bourne	e8061c08f7	Auto-merging docker-versions-create.sh CONFLICT (content): Merge conflict in Dockerfile	2021-02-07 09:18:13 -06:00
Geoff Bourne	2e085f174c	Merge branch 'master' into multiarch-latest	2021-02-06 14:52:49 -06:00
`@@ -1,4 +1,4 @@`
	`FROM adoptopenjdk:15-jre`	`FROM adoptopenjdk:latest`

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