Auto-merging via docker-versions-create

Merge branch 'multiarch' into java15
2026-02-21 08:46:22 +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 · 2021-05-06 20:16:34 -05:00 · 2021-04-30 14:29:57 -05:00
2 changed files with 2 additions and 2 deletions
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -59,7 +59,7 @@ jobs:
        uses: docker/build-push-action@v2.4.0
        with:
          context: .
-          platforms: linux/amd64,linux/arm64
+          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/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:15-openj9
+FROM adoptopenjdk:15-jre
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
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
Geoff Bourne	78d9d888db	Auto-merging via docker-versions-create	2021-05-06 20:16:34 -05:00
Geoff Bourne	2a67344b93	Auto-merging via docker-versions-create	2021-04-30 14:29:57 -05:00
Geoff Bourne	5a47bb11ba	Auto-merging via docker-versions-create	2021-04-30 11:13:53 -05:00
Geoff Bourne	bb8c7756c7	Auto-merging via docker-versions-create	2021-04-28 16:54:26 -05:00
Geoff Bourne	0c860ade12	Auto-merging via docker-versions-create	2021-04-26 08:22:56 -05:00
Geoff Bourne	a99f7a494b	Auto-merging via docker-versions-create	2021-04-24 13:44:29 -05:00
Geoff Bourne	3e9308d315	Auto-merging via docker-versions-create	2021-04-23 21:05:23 -05:00
Geoff Bourne	b731eaaffb	Auto-merging via docker-versions-create	2021-04-18 13:32:03 -05:00
Geoff Bourne	cbf9577a24	Auto-merging via docker-versions-create	2021-04-11 10:11:28 -05:00
Geoff Bourne	9ccfca5061	Merged latest from master	2021-04-08 19:24:14 -05:00
Geoff Bourne	9690832247	Auto-merging via docker-versions-create	2021-04-01 16:39:46 -05:00
Geoff Bourne	60a68963a8	Added git #819	2021-04-01 16:28:50 -05:00
`@@ -1,4 +1,4 @@`
	`FROM adoptopenjdk:15-openj9`	`FROM adoptopenjdk:15-jre`

	`LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"`	`LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"`