Auto-merging via docker-versions-create

Merge branch 'master' into java11-openj9
2026-02-17 15:13:55 +00:00 · 2021-06-05 17:53:21 -05:00 · 2021-05-24 20:52:01 -05:00 · 2021-05-23 12:27:10 -05:00 · 2021-05-22 13:46:22 -05:00 · 2021-05-21 23:02:53 -05:00
3 changed files with 5 additions and 5 deletions
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -25,7 +25,7 @@ jobs:
  docker-buildx:
    runs-on: ubuntu-20.04
    env:
-      CACHE_NAME: master
+      CACHE_NAME: java11-openj9
    steps:
      - name: Checkout
        uses: actions/checkout@v2.3.4
@@ -41,7 +41,7 @@ jobs:
            type=ref,event=tag
            type=edge,branch=master
          flavor: |
-            latest=true
+            latest=false

      - name: Setup Docker Buildx
        uses: docker/setup-buildx-action@v1
@@ -69,7 +69,7 @@ jobs:
        uses: docker/build-push-action@v2.5.0
        with:
          context: .
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          platforms: linux/amd64
          push: ${{ github.event_name != 'pull_request' }}
          tags: ${{ steps.meta.outputs.tags }}
          # ensure latest base image is used
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
      - test
    runs-on: ubuntu-20.04
    env:
-      CACHE_NAME: master
+      CACHE_NAME: java11-openj9

    steps:
    - uses: actions/checkout@v2.3.4
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:16-jre
+FROM adoptopenjdk:11-jre-openj9

 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
Author	SHA1	Message	Date
Geoff Bourne	caffa2fd8d	Auto-merging via docker-versions-create	2021-06-05 17:53:21 -05:00
Geoff Bourne	8de8eb3104	Auto-merging via docker-versions-create	2021-05-24 20:52:01 -05:00
Geoff Bourne	2d3fa3c09e	Merge branch 'master' into java11-openj9	2021-05-23 12:27:10 -05:00
Geoff Bourne	f7b3c77f78	Merge from master	2021-05-22 13:46:22 -05:00
Geoff Bourne	d968048ef5	Auto-merging via docker-versions-create	2021-05-21 23:02:53 -05:00
Geoff Bourne	6d26ca04be	Auto-merging via docker-versions-create	2021-05-21 22:50:55 -05:00
Geoff Bourne	577eef3631	Merge branch 'master' into java11-openj9 # Conflicts: # .github/workflows/build-multiarch.yml # docker-versions-create.sh	2021-05-21 22:41:16 -05:00
Geoff Bourne	21d7fb476b	ci: added java11-openj9 branch	2021-05-21 22:37:40 -05:00
Geoff Bourne	4c3a329e31	ci: adjusted CACHE_NAME	2021-05-21 17:34:05 -05:00
Geoff Bourne	6c94e49732	ci: updated java11 Dockerfile	2021-05-21 17:33:26 -05:00
Geoff Bourne	af77b29509	ci: add java11 to build/merge	2021-05-21 17:32:38 -05:00