Auto-merging via docker-versions-create

Merge branch 'multiarch' into java16
2026-02-17 15:13:55 +00:00 · 2021-05-19 20:31:17 -05:00 · 2021-05-15 12:43:57 -05:00 · 2021-05-14 18:04:56 -05:00 · 2021-05-12 11:33:39 -05:00 · 2021-05-12 11:32:40 -05:00
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:15-jre
+FROM adoptopenjdk:16-jre

 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
Author	SHA1	Message	Date
Geoff Bourne	d8786d4785	Auto-merging via docker-versions-create	2021-05-19 20:31:17 -05:00
Geoff Bourne	8a34aa5c45	Auto-merging via docker-versions-create	2021-05-15 12:43:57 -05:00
Geoff Bourne	bb210ff59e	Merge branch 'multiarch' into java16 # Conflicts: # .github/workflows/build-multiarch.yml # Dockerfile	2021-05-14 18:04:56 -05:00
Geoff Bourne	2c8d1a9255	Merge branch 'master' into java16	2021-05-12 11:33:39 -05:00
Geoff Bourne	a8c11c0cdb	Add java16 branch/image-tag #864	2021-05-12 11:32:40 -05:00