Auto-merging via docker-versions-create

2026-02-17 15:13:55 +00:00 · 2021-07-17 18:04:38 -05:00 · 2021-07-14 18:43:19 -05:00 · 2021-07-12 19:10:15 -05:00 · 2021-07-09 19:58:58 -05:00 · 2021-07-08 18:00:07 -05:00
2 changed files with 2 additions and 2 deletions
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -66,7 +66,7 @@ jobs:
        uses: docker/build-push-action@v2.6.1
        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/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:16-openj9
+FROM adoptopenjdk:11-jre

 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
Author	SHA1	Message	Date
Geoff Bourne	9b6b813fe8	Auto-merging via docker-versions-create	2021-07-17 18:04:38 -05:00
Geoff Bourne	1f39283fd0	Auto-merging via docker-versions-create	2021-07-14 18:43:19 -05:00
Geoff Bourne	2086562d03	Auto-merging via docker-versions-create	2021-07-12 19:10:15 -05:00
Geoff Bourne	67404c017a	Auto-merging via docker-versions-create	2021-07-09 19:58:58 -05:00
Geoff Bourne	41e97454a9	Auto-merging via docker-versions-create	2021-07-08 18:00:07 -05:00
Geoff Bourne	31d082574d	Auto-merging via docker-versions-create	2021-07-08 08:04:19 -05:00
itzg	0f59ec97b7	Auto-merging via docker-versions-create	2021-07-08 12:56:03 +00:00
Geoff Bourne	a1ce1b5a24	Auto-merging via docker-versions-create	2021-07-08 07:39:17 -05:00
itzg	fb3504ec1a	Auto-merging via docker-versions-create	2021-07-04 19:54:04 +00:00
Geoff Bourne	b75f83cbf1	Auto-merging via docker-versions-create	2021-07-03 14:24:32 -05:00
Geoff Bourne	dc5192e2e7	ci: auto-merge from master	2021-07-02 15:59:12 -05:00
itzg	76b5ec75cc	Auto-merging via docker-versions-create	2021-07-02 16:55:58 +00:00
itzg	4663723b84	Auto-merging via docker-versions-create	2021-06-28 12:14:08 +00:00
itzg	2acb45dc62	Auto-merging via docker-versions-create	2021-06-27 13:13:14 +00:00
itzg	de42f62031	Auto-merging via docker-versions-create	2021-06-24 12:47:08 +00:00
Geoff Bourne	7e690849b6	Auto-merging via docker-versions-create	2021-06-23 22:34:21 -05:00
Geoff Bourne	0a1c00f701	Auto-merging via docker-versions-create	2021-06-20 12:49:10 -05:00
Geoff Bourne	dc8c9e5d1a	Auto-merging via docker-versions-create	2021-06-05 17:52:23 -05:00
Geoff Bourne	9577c84d6a	Auto-merging via docker-versions-create	2021-05-24 20:51:26 -05:00
Geoff Bourne	575197a109	Merge branch 'master' into java11	2021-05-23 12:27:03 -05:00
Geoff Bourne	2b621b8236	Merge from master	2021-05-22 13:45:56 -05:00
Geoff Bourne	14d3446f52	Auto-merging via docker-versions-create	2021-05-21 23:02:26 -05:00
Geoff Bourne	83a7481027	Auto-merging via docker-versions-create	2021-05-21 22:50:35 -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