Auto-merging via docker-versions-create

2026-02-18 23:36:24 +00:00 · 2021-06-20 12:47:20 -05:00 · 2021-06-05 17:50:27 -05:00 · 2021-05-24 20:50:17 -05:00 · 2021-05-23 12:26:47 -05:00 · 2021-05-22 12:59:25 -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: java8-openj9
+      CACHE_NAME: java8-multiarch
    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: java8-openj9
+      CACHE_NAME: java8-multiarch

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

 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
Author	SHA1	Message	Date
Geoff Bourne	c1b040af77	Auto-merging via docker-versions-create	2021-06-20 12:47:20 -05:00
Geoff Bourne	4148325787	Auto-merging via docker-versions-create	2021-06-05 17:50:27 -05:00
Geoff Bourne	7083cd15e8	Auto-merging via docker-versions-create	2021-05-24 20:50:17 -05:00
Geoff Bourne	7418dab476	Merge branch 'master' into java8-multiarch	2021-05-23 12:26:47 -05:00
Geoff Bourne	94bbc8e649	Merge from master	2021-05-22 12:59:25 -05:00
Geoff Bourne	3e5e62229a	Auto-merging via docker-versions-create	2021-05-21 23:01:34 -05:00
Geoff Bourne	fe2a9d56ed	Auto-merging via docker-versions-create	2021-05-21 22:47:56 -05:00