Auto-merging via docker-versions-create

Merge branch 'master' into java8-openj9
ci: added java8-openj9 branch
2026-02-17 15:13:55 +00:00 · 2021-05-21 22:48:32 -05:00 · 2021-05-21 22:35:00 -05:00 · 2021-05-21 22:31:40 -05:00
3 changed files with 4 additions and 4 deletions
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -27,7 +27,7 @@ jobs:
  docker-buildx:
    runs-on: ubuntu-20.04
    env:
-      CACHE_NAME: java8-multiarch
+      CACHE_NAME: java8-openj9
    steps:
      - name: Checkout
        uses: actions/checkout@v2.3.4
@@ -69,7 +69,7 @@ jobs:
        uses: docker/build-push-action@v2.4.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: java8-multiarch
+      CACHE_NAME: java8-openj9

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

 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
Author	SHA1	Message	Date
Geoff Bourne	0f797487ab	Auto-merging via docker-versions-create	2021-05-21 22:48:32 -05:00
Geoff Bourne	9511e3cc80	Merge branch 'master' into java8-openj9	2021-05-21 22:35:00 -05:00
Geoff Bourne	3aa4dd6c85	ci: added java8-openj9 branch	2021-05-21 22:31:40 -05:00