Auto-merging via docker-versions-create

Merge branch 'multiarch' into java8-multiarch
2026-02-18 07:26:24 +00:00 · 2021-05-19 20:25:00 -05:00 · 2021-05-15 12:41:22 -05:00 · 2021-05-14 17:59:49 -05:00 · 2021-05-06 20:12:55 -05:00 · 2021-04-30 14:28:07 -05:00
7 changed files with 12 additions and 25 deletions
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -2,18 +2,18 @@ name: Build and publish multiarch
 on:
  push:
    branches:
-      - master
      - multiarch
      - multiarch-latest
-      - java15
-      - java16
+      - java*
      - test/multiarch/*
+    branches-ignore:
+      - java8
    tags:
-      - "[0-9]+.[0-9]+.[0-9]+"
      - "[0-9]+.[0-9]+.[0-9]+-multiarch"
      - "[0-9]+.[0-9]+.[0-9]+-multiarch-latest"
-      - "[0-9]+.[0-9]+.[0-9]+-java15"
-      - "[0-9]+.[0-9]+.[0-9]+-java16"
+      - "[0-9]+.[0-9]+.[0-9]+-java*"
+    tags-ignore:
+      - "[0-9]+.[0-9]+.[0-9]+-java8"
    paths-ignore:
      - "*.md"
      - "docs/**"
@@ -35,7 +35,6 @@ jobs:
          tags: |
            type=ref,event=branch
            type=ref,event=tag
-            type=edge,branch=master

      - name: Setup Docker Buildx
        uses: docker/setup-buildx-action@v1
--- a/.github/workflows/generate-toc.yml
+++ b/.github/workflows/generate-toc.yml
@@ -17,4 +17,4 @@ jobs:
          ./gh-md-toc --insert --no-backup README.md
      - uses: stefanzweifel/git-auto-commit-action@v4.11.0
        with:
-          commit_message: "docs: Auto update markdown TOC"
+          commit_message: Auto update markdown TOC
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,12 +3,14 @@ name: Build and Publish
 on:
  push:
    branches:
+      - master
      - java8
      - openj9
      - openj9-11
      - adopt11
      - test/*
    tags:
+      - "[0-9]+.[0-9]+.[0-9]+"
      - "[0-9]+.[0-9]+.[0-9]+-java8"
      - "[0-9]+.[0-9]+.[0-9]+-openj9"
      - "[0-9]+.[0-9]+.[0-9]+-openj9-11"
--- a/3
+++ b/3
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:16-jre
+FROM adoptopenjdk:8-jre-hotspot

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

@@ -84,6 +84,5 @@ RUN dos2unix /start* && chmod +x /start*
 RUN dos2unix /health.sh && chmod +x /health.sh
 RUN dos2unix /autopause/* && chmod +x /autopause/*.sh

-
 ENTRYPOINT [ "/start" ]
 HEALTHCHECK --start-period=1m CMD /health.sh
--- a/README.md
+++ b/README.md
@@ -143,7 +143,7 @@ By default, the container will download the latest version of the "vanilla" [Min
      * [Enabling Autopause](#enabling-autopause)
   * [Running on RaspberryPi](#running-on-raspberrypi)

-<!-- Added by: runner, at: Fri May 21 12:45:51 UTC 2021 -->
+<!-- Added by: runner, at: Thu May 20 01:17:11 UTC 2021 -->

 <!--te-->

@@ -274,7 +274,7 @@ To use a different version of Java, please use a docker tag to run your Minecraf

 | Tag name       | Java version | Linux  | JVM Type | Architecture      |
 | -------------- | -------------|--------|----------|-------------------|
-| latest         | 16           | Debian | Hotspot  | amd64,arm64,armv7 |
+| latest         | 11           | Alpine | Hotspot  | amd64             |
 | java8          | 8            | Alpine | Hotspot  | amd64             |
 | java8-multiarch | 8           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java15         | 15           | Debian | Hotspot  | amd64,arm64,armv7 |
--- a/12
+++ b/12
@@ -98,12 +98,6 @@ case "${TYPE^^}" in
  ;;

  FORGE)
-    log "**********************************************************************"
-    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"
-    log "**********************************************************************"
    exec ${SCRIPTS:-/}start-deployForge "$@"
  ;;

@@ -116,12 +110,6 @@ case "${TYPE^^}" in
  ;;

  FTB|CURSEFORGE)
-    log "**********************************************************************"
-    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"
-    log "**********************************************************************"
    exec ${SCRIPTS:-/}start-deployCF "$@"
  ;;

--- a/1
+++ b/1
@@ -246,4 +246,3 @@ else
    exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java "${finalArgs[@]}"
  fi
 fi
-
Author	SHA1	Message	Date
Geoff Bourne	49d89d3e73	Auto-merging via docker-versions-create	2021-05-19 20:25:00 -05:00
Geoff Bourne	74203b23f4	Auto-merging via docker-versions-create	2021-05-15 12:41:22 -05:00
Geoff Bourne	4fb791b490	Merge branch 'multiarch' into java8-multiarch # Conflicts: # Dockerfile # start-configuration	2021-05-14 17:59:49 -05:00
Geoff Bourne	ced25ad50a	Auto-merging via docker-versions-create	2021-05-06 20:12:55 -05:00
Geoff Bourne	48efc224ba	Auto-merging via docker-versions-create	2021-04-30 14:28:07 -05:00
Geoff Bourne	467c1d9954	Auto-merging via docker-versions-create	2021-04-30 11:11:46 -05:00
Geoff Bourne	9ced230f55	Auto-merging via docker-versions-create	2021-04-28 16:51:29 -05:00
Geoff Bourne	f3a8276362	Auto-merging via docker-versions-create	2021-04-26 08:21:06 -05:00
Geoff Bourne	b91d63716e	Auto-merging via docker-versions-create	2021-04-24 13:42:37 -05:00
Geoff Bourne	46cccfd531	Auto-merging via docker-versions-create	2021-04-23 21:03:21 -05:00
Geoff Bourne	9fe1cb4a0d	ci: Switched multiarch-java8 to be based on adoptopenjdk:8-jre-hotspot	2021-04-21 20:13:22 -05:00
Geoff Bourne	076038b470	Auto-merging via docker-versions-create	2021-04-18 13:29:46 -05:00
Geoff Bourne	aa416729ea	Auto-merging via docker-versions-create	2021-04-11 10:09:19 -05:00
Geoff Bourne	812c6365ec	Merged latest from master	2021-04-08 19:14:45 -05:00
Geoff Bourne	42a5131b19	Merging latest from master	2021-04-01 16:32:55 -05:00
Geoff Bourne	624f6a210f	Added git #819	2021-04-01 16:28:32 -05:00
Geoff Bourne	1c63cd18b7	Merge branch 'master' into java8-multiarch # Conflicts: # start-configuration	2021-03-06 16:24:55 -06:00
Geoff Bourne	6266a7e3cc	Shifted PATH-fix earlier in startup	2021-03-06 16:04:31 -06:00
Geoff Bourne	871ecd4d9d	Merge branch 'master' into java8-multiarch # Conflicts: # start-minecraftFinalSetup	2021-02-27 20:52:36 -06:00
Geoff Bourne	c572c95161	Ensure FTBA version.json is readable #784	2021-02-27 16:58:25 -06:00
Geoff Bourne	f7b58fbbb1	Fix PATH to include java when needed	2021-02-10 14:51:24 -06:00
Geoff Bourne	eccfa444a9	Auto-merging via docker-versions-create	2021-02-10 14:02:05 -06:00
Geoff Bourne	e831d25706	Merged latest from master	2021-02-08 21:18:28 -06:00
Geoff Bourne	12e931332b	Auto-merging via docker-versions-create CONFLICT (content): Merge conflict in Dockerfile	2021-02-07 18:06:06 -06:00
Geoff Bourne	ceee9eddc9	ci: restored base image to ubuntu and install openjdk-8	2021-02-06 15:53:59 -06:00
Geoff Bourne	60ba668743	Merge branch 'master' into java8-multiarch # Conflicts: # Dockerfile	2021-02-06 15:49:16 -06:00
Geoff Bourne	fd1b15e01f	ci: Added java8 variant of multiarch	2021-02-06 15:44:02 -06:00