Auto-merging via docker-versions-create

2026-02-17 15:13:55 +00:00 · 2021-07-17 18:07:28 -05:00 · 2021-07-14 18:43:39 -05:00 · 2021-07-12 19:12:21 -05:00 · 2021-07-09 20:01:02 -05:00 · 2021-07-08 18:02:27 -05:00
2 changed files with 3 additions and 3 deletions
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:16-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	ed47657b0e	Auto-merging via docker-versions-create	2021-07-17 18:07:28 -05:00
Geoff Bourne	895e3d2cef	Auto-merging via docker-versions-create	2021-07-14 18:43:39 -05:00
Geoff Bourne	d4435007a8	Auto-merging via docker-versions-create	2021-07-12 19:12:21 -05:00
Geoff Bourne	aac7b952e7	Auto-merging via docker-versions-create	2021-07-09 20:01:02 -05:00
Geoff Bourne	8a7d9b42f4	Auto-merging via docker-versions-create	2021-07-08 18:02:27 -05:00
Geoff Bourne	cd228f7b88	Auto-merging via docker-versions-create	2021-07-08 08:06:42 -05:00
itzg	2eef9c00bc	Auto-merging via docker-versions-create	2021-07-08 12:56:15 +00:00
Geoff Bourne	99a470f81b	Auto-merging via docker-versions-create	2021-07-08 07:43:27 -05:00
itzg	837f6701d4	Auto-merging via docker-versions-create	2021-07-04 19:54:13 +00:00
Geoff Bourne	3b7427722d	Auto-merging from master	2021-07-03 14:31:16 -05:00
Geoff Bourne	ca0d8ecc42	ci: auto-merge from master	2021-07-02 16:20:46 -05:00
itzg	6580a6f980	Auto-merging via docker-versions-create	2021-07-02 16:56:10 +00:00
itzg	cbd1960788	Auto-merging via docker-versions-create	2021-06-28 12:14:20 +00:00
itzg	c1c0082650	Auto-merging via docker-versions-create	2021-06-27 13:13:25 +00:00
itzg	09d48be128	Auto-merging via docker-versions-create	2021-06-24 12:47:19 +00:00
Geoff Bourne	5569c1b245	Auto-merging via docker-versions-create	2021-06-23 22:36:42 -05:00
Geoff Bourne	c2a7a7b9c4	Auto-merging via docker-versions-create	2021-06-20 12:52:11 -05:00
Geoff Bourne	441625654b	Auto-merging via docker-versions-create	2021-06-05 17:56:21 -05:00
Geoff Bourne	9ced589f54	Auto-merging via docker-versions-create	2021-05-24 20:53:42 -05:00
Geoff Bourne	b49bb85483	Merge branch 'master' into multiarch-latest	2021-05-23 12:27:43 -05:00
Geoff Bourne	c2e9fe7847	Merge from master	2021-05-22 13:48:08 -05:00
Geoff Bourne	05e6db5a4e	Auto-merging via docker-versions-create	2021-05-21 23:04:38 -05:00
Geoff Bourne	04e8d07bcf	Auto-merging via docker-versions-create	2021-05-21 22:54:00 -05:00
Geoff Bourne	25d12d9b2c	ci: introduced CACHE_NAME	2021-05-21 22:09:49 -05:00
Geoff Bourne	07e9d59f50	Auto-merging via docker-versions-create	2021-05-19 20:32:29 -05:00
Geoff Bourne	8ace9969af	Auto-merging via docker-versions-create	2021-05-15 12:44:54 -05:00
Geoff Bourne	2dbda0bed4	Merge branch 'multiarch' into multiarch-latest # Conflicts: # .github/workflows/build-multiarch.yml # Dockerfile	2021-05-14 18:06:10 -05:00
Geoff Bourne	6ac97c41a5	Auto-merging via docker-versions-create	2021-05-06 20:18:38 -05:00
Geoff Bourne	a46dfa0a16	Auto-merging via docker-versions-create	2021-04-30 14:31:22 -05:00
Geoff Bourne	98989471f9	Auto-merging via docker-versions-create	2021-04-30 11:15:27 -05:00
Geoff Bourne	1aefe31c1c	Auto-merging via docker-versions-create	2021-04-28 16:56:40 -05:00
Geoff Bourne	07b90ec1f4	Auto-merging via docker-versions-create	2021-04-26 08:24:13 -05:00
Geoff Bourne	11c7e64566	Auto-merging via docker-versions-create	2021-04-24 13:45:50 -05:00
Geoff Bourne	2becc9e25e	Auto-merging via docker-versions-create	2021-04-23 21:06:52 -05:00
Geoff Bourne	a941ee8093	Auto-merging via docker-versions-create	2021-04-18 13:33:58 -05:00
Geoff Bourne	635a17949d	Auto-merging via docker-versions-create	2021-04-11 10:13:08 -05:00
Geoff Bourne	c42d9b6170	Merged latest from master	2021-04-08 19:35:00 -05:00
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