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-26 08:22:43 +00:00 · 2021-02-07 09:10:34 -06:00 · 2021-01-29 21:03:36 -06:00 · 2021-01-12 17:25:45 -06:00
1 changed files with 2 additions and 1 deletions
--- a/3
+++ b/3
@@ -1,7 +1,8 @@
-FROM adoptopenjdk/openjdk11-openj9:alpine
+FROM adoptopenjdk/openjdk8-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	895bbd713e	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:10:34 -06:00
Geoff Bourne	a3542e9e0b	Auto-merging via docker-versions-create	2021-01-29 21:03:36 -06:00
Geoff Bourne	23c0cd3017	Auto-merging via docker-versions-create	2021-01-12 17:25:45 -06:00