Auto-merging via docker-versions-create

Merge branch 'master' into java16
2026-02-17 15:13:55 +00:00 · 2021-06-05 17:54:18 -05:00 · 2021-05-24 20:52:34 -05:00 · 2021-05-23 12:27:27 -05:00 · 2021-05-22 13:47:15 -05:00 · 2021-05-21 23:03:45 -05:00
3 changed files with 4 additions and 4 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: java11-openj9
+      CACHE_NAME: java16
    steps:
      - name: Checkout
        uses: actions/checkout@v2.3.4
@@ -69,7 +69,7 @@ jobs:
        uses: docker/build-push-action@v2.5.0
        with:
          context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
          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: java11-openj9
+      CACHE_NAME: java16

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

 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
Author	SHA1	Message	Date
Geoff Bourne	b5877f6208	Auto-merging via docker-versions-create	2021-06-05 17:54:18 -05:00
Geoff Bourne	d561c026c6	Auto-merging via docker-versions-create	2021-05-24 20:52:34 -05:00
Geoff Bourne	3cd3ca9d88	Merge branch 'master' into java16	2021-05-23 12:27:27 -05:00
Geoff Bourne	b9ef9a46b6	Merge from master	2021-05-22 13:47:15 -05:00
Geoff Bourne	275863f04c	Auto-merging via docker-versions-create	2021-05-21 23:03:45 -05:00
Geoff Bourne	ae94a6be3a	Auto-merging via docker-versions-create	2021-05-21 22:52:46 -05:00
Geoff Bourne	d08c6e2c46	ci: updated CACHE_NAME	2021-05-21 22:13:59 -05:00