Auto-merging via docker-versions-create

Merge branch 'multiarch' into java15-openj9
2026-02-19 07:46:23 +00:00 · 2021-05-19 20:30:40 -05:00 · 2021-05-15 12:43:32 -05:00 · 2021-05-14 18:03:39 -05:00 · 2021-05-06 20:17:17 -05:00 · 2021-04-30 14:30:25 -05:00
3 changed files with 4 additions and 4 deletions
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -59,7 +59,7 @@ jobs:
        uses: docker/build-push-action@v2.4.0
        with:
          context: .
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          platforms: linux/amd64,linux/arm64
          push: ${{ github.event_name != 'pull_request' }}
          tags: ${{ steps.meta.outputs.tags }}
          # ensure latest base image is used
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:latest
+FROM adoptopenjdk:15-openj9

 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-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	d030daf354	Auto-merging via docker-versions-create	2021-05-19 20:30:40 -05:00
Geoff Bourne	98e6adbe1a	Auto-merging via docker-versions-create	2021-05-15 12:43:32 -05:00
Geoff Bourne	b94cfc44a0	Merge branch 'multiarch' into java15-openj9 # Conflicts: # .github/workflows/build-multiarch.yml # Dockerfile	2021-05-14 18:03:39 -05:00
Geoff Bourne	8a9e85fb17	Auto-merging via docker-versions-create	2021-05-06 20:17:17 -05:00
Geoff Bourne	8a39719427	Auto-merging via docker-versions-create	2021-04-30 14:30:25 -05:00
Geoff Bourne	4100aa1f61	Auto-merging via docker-versions-create	2021-04-30 11:14:31 -05:00
Geoff Bourne	4d5fe0a03b	Auto-merging via docker-versions-create	2021-04-28 16:55:09 -05:00
Geoff Bourne	236bb565ce	Auto-merging via docker-versions-create	2021-04-26 08:23:22 -05:00
Geoff Bourne	7608168823	Auto-merging via docker-versions-create	2021-04-24 13:44:55 -05:00
Geoff Bourne	acabb9d93c	Auto-merging via docker-versions-create	2021-04-23 21:05:53 -05:00
Geoff Bourne	4e9c00c4d5	Auto-merging via docker-versions-create	2021-04-18 13:32:45 -05:00
Geoff Bourne	f3826422cf	Auto-merging via docker-versions-create	2021-04-11 10:12:00 -05:00
Geoff Bourne	9b7459ad5c	Merged latest from master	2021-04-08 19:28:35 -05:00
Geoff Bourne	c9dc6012f6	Auto-merging via docker-versions-create	2021-04-01 16:40:16 -05:00
Geoff Bourne	a5aec72837	Added git #819	2021-04-01 16:29:06 -05:00
Geoff Bourne	af38a8fc7a	ci: removed armv7 build since 15-openj9 doesn't include it	2021-03-06 17:27:08 -06:00
Geoff Bourne	58fa3c897d	Merge branch 'master' into java15-openj9	2021-03-06 17:23:02 -06:00
Geoff Bourne	e45621d8e2	ci: Added java15-openj9 branch	2021-03-06 17:22:36 -06: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