Auto-merging via docker-versions-create

Merge branch 'multiarch' into java16
2026-07-08 17:45:11 +00:00 · 2021-05-19 20:31:17 -05:00 · 2021-05-15 12:43:57 -05:00 · 2021-05-14 18:04:56 -05:00 · 2021-05-12 11:33:39 -05:00 · 2021-05-12 11:32:40 -05:00
2 changed files with 3 additions and 3 deletions
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:latest
+FROM adoptopenjdk:16-jre
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
@@ -99,7 +99,7 @@ case "${TYPE^^}" in
  FORGE)
    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8-multiarch is recommended"
+    log "WARNING: The image tag itzg/minecraft-server:java8 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-multiarch is recommended"
+    log "WARNING: The image tag itzg/minecraft-server:java8 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	d8786d4785	Auto-merging via docker-versions-create	2021-05-19 20:31:17 -05:00
Geoff Bourne	8a34aa5c45	Auto-merging via docker-versions-create	2021-05-15 12:43:57 -05:00
Geoff Bourne	bb210ff59e	Merge branch 'multiarch' into java16 # Conflicts: # .github/workflows/build-multiarch.yml # Dockerfile	2021-05-14 18:04:56 -05:00
Geoff Bourne	2c8d1a9255	Merge branch 'master' into java16	2021-05-12 11:33:39 -05:00
Geoff Bourne	a8c11c0cdb	Add java16 branch/image-tag #864	2021-05-12 11:32:40 -05:00
Geoff Bourne	78d9d888db	Auto-merging via docker-versions-create	2021-05-06 20:16:34 -05:00
Geoff Bourne	2a67344b93	Auto-merging via docker-versions-create	2021-04-30 14:29:57 -05:00
Geoff Bourne	5a47bb11ba	Auto-merging via docker-versions-create	2021-04-30 11:13:53 -05:00
Geoff Bourne	bb8c7756c7	Auto-merging via docker-versions-create	2021-04-28 16:54:26 -05:00
Geoff Bourne	0c860ade12	Auto-merging via docker-versions-create	2021-04-26 08:22:56 -05:00
Geoff Bourne	a99f7a494b	Auto-merging via docker-versions-create	2021-04-24 13:44:29 -05:00
Geoff Bourne	3e9308d315	Auto-merging via docker-versions-create	2021-04-23 21:05:23 -05:00
Geoff Bourne	b731eaaffb	Auto-merging via docker-versions-create	2021-04-18 13:32:03 -05:00
Geoff Bourne	cbf9577a24	Auto-merging via docker-versions-create	2021-04-11 10:11:28 -05:00
Geoff Bourne	9ccfca5061	Merged latest from master	2021-04-08 19:24:14 -05:00
Geoff Bourne	9690832247	Auto-merging via docker-versions-create	2021-04-01 16:39:46 -05:00
Geoff Bourne	60a68963a8	Added git #819	2021-04-01 16:28:50 -05:00
Geoff Bourne	6ae431b2f0	Merge branch 'master' into java15	2021-03-06 16:25:21 -06:00
Geoff Bourne	ebabfeb669	Shifted PATH-fix earlier in startup	2021-03-06 16:05:01 -06:00
Geoff Bourne	457e9b53c7	Auto-merging via docker-versions-create	2021-02-27 20:55:30 -06:00
Geoff Bourne	21572d3547	Ensure FTBA version.json is readable #784	2021-02-27 17:03:37 -06:00
Geoff Bourne	b176be942d	Fix PATH to include java when needed	2021-02-10 14:52:16 -06:00
Geoff Bourne	51c5902db0	Merge from master CONFLICT (content): Merge conflict in start-configuration	2021-02-10 14:06:10 -06:00
Geoff Bourne	090e624ebc	Auto-merging via docker-versions-create CONFLICT (content): Merge conflict in Dockerfile	2021-02-07 18:20:35 -06:00
Geoff Bourne	c8dc751b82	Auto-merging docker-versions-create.sh CONFLICT (content): Merge conflict in Dockerfile	2021-02-07 09:15:01 -06:00
Geoff Bourne	7c862df92a	Merge branch 'master' into java15	2021-02-06 15:12:45 -06:00
Geoff Bourne	e49c1c2f01	Merge branch 'master' into java15	2021-02-06 15:11:34 -06:00
Geoff Bourne	57390b02ca	Merge branch 'master' into java15	2021-02-06 14:53:02 -06:00
Geoff Bourne	a698248dff	ci: Based on adoptopenjdk:15-jre	2021-02-06 14:50:43 -06:00
`@@ -1,4 +1,4 @@`
	`FROM adoptopenjdk:latest`	`FROM adoptopenjdk:16-jre`

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