Auto-merging docker-versions-create.sh

CONFLICT (content): Merge conflict in Dockerfile
Merge branch 'master' into java15
2026-02-17 15:13:55 +00:00 · 2021-02-07 09:15:01 -06:00 · 2021-02-06 15:12:45 -06:00 · 2021-02-06 15:11:34 -06:00 · 2021-02-06 14:53:02 -06:00 · 2021-02-06 14:50:43 -06:00
1 changed files with 1 additions and 2 deletions
--- a/3
+++ b/3
@@ -1,11 +1,10 @@
-FROM ubuntu:18.04
+FROM adoptopenjdk:15-jre

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

 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive \
  apt-get install -y \
-    openjdk-8-jre-headless \
    imagemagick \
    gosu \
    sudo \
Author	SHA1	Message	Date
Geoff Bourne	c8dc751b82	Auto-merging docker-versions-create.sh CONFLICT (content): Merge conflict in Dockerfile	2021-02-07 09:15:01 -06:00
Geoff Bourne	7c862df92a	Merge branch 'master' into java15	2021-02-06 15:12:45 -06:00
Geoff Bourne	e49c1c2f01	Merge branch 'master' into java15	2021-02-06 15:11:34 -06:00
Geoff Bourne	57390b02ca	Merge branch 'master' into java15	2021-02-06 14:53:02 -06:00
Geoff Bourne	a698248dff	ci: Based on adoptopenjdk:15-jre	2021-02-06 14:50:43 -06:00
Geoff Bourne	b8ef6eba3f	Auto-merging via docker-versions-create	2021-01-29 21:07:29 -06:00
Geoff Bourne	cc5fe0859a	Auto-merging via docker-versions-create	2021-01-12 17:28:33 -06:00
Geoff Bourne	8f15aac6fc	Merge branch 'multiarch' into multiarch-latest	2021-01-12 17:06:00 -06:00
Geoff Bourne	84ce3b4b47	Merge branch 'multiarch' into multiarch-latest	2021-01-09 14:07:31 -06:00
Geoff Bourne	b07c43a32f	Merge branch 'multiarch' into multiarch-latest	2021-01-09 12:31:20 -06:00
Geoff Bourne	ce1b337f7f	Auto-merging via docker-versions-create	2021-01-09 11:25:38 -06:00
Geoff Bourne	ee8e1b9322	Merged latest from master	2021-01-06 22:16:40 -06:00
Geoff Bourne	20bd5c4c36	Merge branch 'multiarch' into multiarch-latest	2020-12-31 13:19:34 -06:00
Geoff Bourne	de082d0fb2	Merge branch 'multiarch' into multiarch-latest	2020-12-28 11:44:41 -06:00
Geoff Bourne	3cc5cdbc06	Auto-merging via docker-versions-create	2020-12-27 22:08:29 -06:00
Geoff Bourne	b69ec47b18	Auto-merging via docker-versions-create	2020-12-19 08:26:49 -06:00
Geoff Bourne	51fc8e824d	Auto-merging via docker-versions-create	2020-12-15 14:00:33 -06:00
Geoff Bourne	aff9031284	Merge branch 'multiarch' into multiarch-latest	2020-11-26 08:46:26 -06:00
Geoff Bourne	397d080da2	Merge branch 'multiarch' into multiarch-latest	2020-11-25 21:36:48 -06:00
Geoff Bourne	cb5d052829	Merge branch 'multiarch' into multiarch-latest # Conflicts: # .github/workflows/build-multiarch.yml	2020-11-25 16:09:23 -06:00
Geoff Bourne	0908d21bed	Merged from master	2020-11-25 16:01:42 -06:00
Marc Doughty	4d878985d4	Remove distro-provided JRE (#659 ) We don't need Java 8 from Ubuntu, we have 15 from AdoptOpenJDK.	2020-11-03 06:33:19 -06:00
Geoff Bourne	72d7d4a65e	Switched to latest Docker buildx github action	2020-10-31 14:48:51 -05:00
Geoff Bourne	cb0add3b90	Added github action match for multiarch-latest branch	2020-10-31 13:38:44 -05:00
Marc Doughty	71a48ce10f	Convert to AdoptOpenJDK (#658 )	2020-10-31 13:36:47 -05:00