Auto-merging via docker-versions-create

Merge branch 'multiarch' into java15
2026-02-18 15:36: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
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:16-jre
+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
`@@ -1,4 +1,4 @@`
	`FROM adoptopenjdk:16-jre`	`FROM adoptopenjdk:15-jre`

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