Auto-merging via docker-versions-create

CONFLICT (content): Merge conflict in Dockerfile
ci: restored base image to ubuntu and install openjdk-8
2026-02-17 15:13:55 +00:00 · 2021-02-07 18:06:06 -06:00 · 2021-02-06 15:53:59 -06:00 · 2021-02-06 15:49:16 -06:00 · 2021-02-06 15:44:02 -06:00
1 changed files with 2 additions and 1 deletions
--- a/3
+++ b/3
@@ -1,10 +1,11 @@
-FROM adoptopenjdk:11-jre
+FROM ubuntu:18.04

 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	12e931332b	Auto-merging via docker-versions-create CONFLICT (content): Merge conflict in Dockerfile	2021-02-07 18:06:06 -06:00
Geoff Bourne	ceee9eddc9	ci: restored base image to ubuntu and install openjdk-8	2021-02-06 15:53:59 -06:00
Geoff Bourne	60ba668743	Merge branch 'master' into java8-multiarch # Conflicts: # Dockerfile	2021-02-06 15:49:16 -06:00
Geoff Bourne	fd1b15e01f	ci: Added java8 variant of multiarch	2021-02-06 15:44:02 -06:00