Merged latest from master

Auto-merging via docker-versions-create
Added git
2026-05-22 11:45:34 +00:00 · 2021-04-08 19:32:07 -05:00 · 2021-04-01 16:40:48 -05:00 · 2021-04-01 16:27:50 -05:00 · 2021-03-06 16:27:57 -06:00 · 2021-03-06 16:06:43 -06:00
1 changed files with 1 additions and 1 deletions
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:15-jre
+FROM adoptopenjdk:11-jre

 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
Author	SHA1	Message	Date
Geoff Bourne	10a3037ab3	Merged latest from master	2021-04-08 19:32:07 -05:00
Geoff Bourne	6fab527eed	Auto-merging via docker-versions-create	2021-04-01 16:40:48 -05:00
Geoff Bourne	e5948081a7	Added git #819	2021-04-01 16:27:50 -05:00
Geoff Bourne	298bf5fb0a	Merge branch 'master' into multiarch	2021-03-06 16:27:57 -06:00
Geoff Bourne	44769b6001	Shifted PATH-fix earlier in startup	2021-03-06 16:06:43 -06:00
Geoff Bourne	4186cfd91c	Auto-merging via docker-versions-create	2021-02-27 20:56:01 -06:00
Geoff Bourne	89afba7437	Ensure FTBA version.json is readable #784	2021-02-27 17:03:09 -06:00
Geoff Bourne	f397dd71a9	Fix PATH to include java when needed	2021-02-11 14:52:51 -06:00
Geoff Bourne	02e0a47a52	Merge branch master	2021-02-10 14:58:33 -06:00
Geoff Bourne	60809fe5ad	Merge from master CONFLICT (content): Merge conflict in start-configuration	2021-02-10 14:08:21 -06:00
Geoff Bourne	4a8e416fe1	Auto-merging via docker-versions-create CONFLICT (content): Merge conflict in Dockerfile	2021-02-07 18:22:16 -06:00
Geoff Bourne	ce4efd0b70	Auto-merging docker-versions-create.sh CONFLICT (content): Merge conflict in Dockerfile	2021-02-07 09:16:33 -06:00
Geoff Bourne	f856276d71	Upgraded multiarch to Java 11	2021-02-06 15:22:15 -06:00
Geoff Bourne	0300854c46	Merge branch 'master' into multiarch	2021-02-06 15:21:53 -06:00
Geoff Bourne	f06e9f5ede	Merge branch 'master' into multiarch	2021-02-06 14:52:35 -06:00
Geoff Bourne	8d3ca813ed	Auto-merging via docker-versions-create	2021-01-29 21:07:00 -06:00
Geoff Bourne	e97a00e61d	Auto-merging via docker-versions-create	2021-01-12 17:28:11 -06:00