Auto-merging via docker-versions-create

Merge branch 'multiarch' into java15
2026-02-17 23:16:24 +00:00 · 2021-05-19 20:30:03 -05:00 · 2021-05-15 12:43:07 -05:00 · 2021-05-14 18:01:56 -05:00
6 changed files with 6 additions and 9 deletions
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -2,14 +2,12 @@ name: Build and publish multiarch
 on:
  push:
    branches:
-      - master
      - multiarch
      - multiarch-latest
      - java15
      - java16
      - test/multiarch/*
    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"
@@ -35,7 +33,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:15-jre

 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/1
+++ b/1
@@ -246,4 +246,3 @@ else
    exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java "${finalArgs[@]}"
  fi
 fi
-
Author	SHA1	Message	Date
Geoff Bourne	521099b733	Auto-merging via docker-versions-create	2021-05-19 20:30:03 -05:00
Geoff Bourne	f297654bb6	Auto-merging via docker-versions-create	2021-05-15 12:43:07 -05:00
Geoff Bourne	01bd8f5860	Merge branch 'multiarch' into java15 # Conflicts: # .github/workflows/build-multiarch.yml # Dockerfile	2021-05-14 18:01:56 -05:00