Auto-merging docker-versions-create.sh

CONFLICT (content): Merge conflict in Dockerfile CONFLICT (add/add): Merge conflict in .github/workflows/build-multiarch.yml
Auto-merging via docker-versions-create
2026-03-17 20:15:59 +00:00 · 2021-02-07 09:12:30 -06:00 · 2021-01-29 21:04:06 -06:00 · 2021-01-12 17:26:05 -06:00 · 2021-01-12 17:15:18 -06:00
1 changed files with 1 additions and 2 deletions
--- a/3
+++ b/3
@@ -1,8 +1,7 @@
-FROM adoptopenjdk/openjdk8-openj9:alpine
+FROM adoptopenjdk/openjdk11-openj9:alpine

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

-# upgrade all packages since alpine jre8 base image tops out at 8u212
 RUN apk -U --no-cache upgrade

 RUN apk add --no-cache -U \
Author	SHA1	Message	Date
Geoff Bourne	34edb10571	Auto-merging docker-versions-create.sh CONFLICT (content): Merge conflict in Dockerfile CONFLICT (add/add): Merge conflict in .github/workflows/build-multiarch.yml	2021-02-07 09:12:30 -06:00
Geoff Bourne	1de85d667f	Auto-merging via docker-versions-create	2021-01-29 21:04:06 -06:00
Geoff Bourne	97cb1a8c87	Auto-merging via docker-versions-create	2021-01-12 17:26:05 -06:00
Geoff Bourne	bd8c630f45	ci: Added openj9 JDK11 branch	2021-01-12 17:15:18 -06:00