Merged latest from master

Merging latest from master
Merge branch 'master' into openj9-11
2026-04-04 04:38:52 +00:00 · 2021-04-08 19:18:53 -05:00 · 2021-04-01 16:38:01 -05:00 · 2021-03-06 16:27:43 -06:00 · 2021-03-06 16:06:19 -06:00 · 2021-02-27 20:54:28 -06:00
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk8-openj9:alpine
+FROM adoptopenjdk/openjdk11-openj9:alpine

 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
Author	SHA1	Message	Date
Geoff Bourne	f6adaf7432	Merged latest from master	2021-04-08 19:18:53 -05:00
Geoff Bourne	2a2125cded	Merging latest from master	2021-04-01 16:38:01 -05:00
Geoff Bourne	192f004913	Merge branch 'master' into openj9-11	2021-03-06 16:27:43 -06:00
Geoff Bourne	5920d41fe6	Shifted PATH-fix earlier in startup	2021-03-06 16:06:19 -06:00
Geoff Bourne	9892df4f48	Auto-merging via docker-versions-create	2021-02-27 20:54:28 -06:00
Geoff Bourne	6fd01d662f	Merge branch 'master' into openj9-11	2021-02-10 14:57:02 -06:00
Geoff Bourne	2fc56067fa	Auto-merging via docker-versions-create	2021-02-10 14:03:07 -06:00
Geoff Bourne	01fb2e1947	Auto-merging via docker-versions-create CONFLICT (content): Merge conflict in Dockerfile	2021-02-07 18:18:18 -06:00
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