Auto-merging via docker-versions-create

2026-02-17 23:16:24 +00:00 · 2021-09-15 21:06:17 -05:00 · 2021-09-15 20:36:24 -05:00 · 2021-08-30 21:36:43 -05:00 · 2021-08-10 12:55:40 -05:00 · 2021-08-01 12:12:03 -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.7.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/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	551e4d6346	Auto-merging via docker-versions-create	2021-09-15 21:06:17 -05:00
Geoff Bourne	61a660ee48	Auto-merging via docker-versions-create	2021-09-15 20:36:24 -05:00
Geoff Bourne	5e9806736c	Auto-merging via docker-versions-create	2021-08-30 21:36:43 -05:00
Geoff Bourne	d5865cd60c	Auto-merging via docker-versions-create	2021-08-10 12:55:40 -05:00
Geoff Bourne	2b0b8f8a62	Auto-merging via docker-versions-create	2021-08-01 12:12:03 -05:00
Geoff Bourne	e94b40bddf	Auto-merging via docker-versions-create	2021-07-31 09:26:53 -05:00
Geoff Bourne	2dabf34349	Auto-merging via docker-versions-create	2021-07-26 19:34:50 -05:00
Geoff Bourne	eb864c0fb8	Merged latest from master	2021-07-25 18:19:51 -05:00
Geoff Bourne	2e0f469748	Auto-merging via docker-versions-create	2021-07-25 09:36:09 -05:00
Geoff Bourne	aa95dc291b	Auto-merging via docker-versions-create	2021-07-23 21:27:05 -05:00
Geoff Bourne	d22280fae7	Auto-merging via docker-versions-create	2021-07-17 21:14:11 -05:00
Geoff Bourne	aac3c1c77a	Auto-merging via docker-versions-create	2021-07-17 20:56:57 -05:00
Geoff Bourne	61b0eff4ca	Auto-merging via docker-versions-create	2021-07-17 18:03:14 -05:00
Geoff Bourne	8c5f0a53bf	Auto-merging via docker-versions-create	2021-07-14 18:43:09 -05:00
Geoff Bourne	fffeb7bb9c	Auto-merging via docker-versions-create	2021-07-12 19:09:09 -05:00
Geoff Bourne	a060cc88d1	Auto-merging via docker-versions-create	2021-07-09 19:57:54 -05:00
Geoff Bourne	4421aaa22d	Auto-merging via docker-versions-create	2021-07-08 17:58:52 -05:00
Geoff Bourne	3a51db6d24	Auto-merging via docker-versions-create	2021-07-08 08:03:13 -05:00
itzg	969a23ae27	Auto-merging via docker-versions-create	2021-07-08 12:55:57 +00:00
itzg	1a62592fe2	Auto-merging via docker-versions-create	2021-07-07 14:56:37 +00:00
itzg	c316dbb5d2	Auto-merging via docker-versions-create	2021-07-06 12:22:22 +00:00
itzg	bb64135c9b	Auto-merging via docker-versions-create	2021-07-05 12:10:26 +00:00
itzg	ef98de154c	Auto-merging via docker-versions-create	2021-07-04 19:53:59 +00:00
Geoff Bourne	3d00077ef8	Auto-merging via docker-versions-create	2021-07-03 14:23:40 -05:00
Geoff Bourne	0d3ab75683	ci: auto-merge from master	2021-07-02 15:54:54 -05:00
itzg	87681e64bb	Auto-merging via docker-versions-create	2021-07-02 16:55:52 +00:00
itzg	8ce986d3d7	Auto-merging via docker-versions-create	2021-06-28 12:14:01 +00:00
itzg	67fda61de4	Auto-merging via docker-versions-create	2021-06-27 13:13:08 +00:00
itzg	7c6ec41822	Auto-merging via docker-versions-create	2021-06-24 12:47:02 +00:00
Geoff Bourne	93af2025a2	Auto-merging via docker-versions-create	2021-06-23 22:33:07 -05:00
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