Auto-merging via docker-versions-create

CONFLICT (content): Merge conflict in Dockerfile
Auto-merging docker-versions-create.sh
2026-02-17 15:13:55 +00:00 · 2021-02-07 18:22:16 -06:00 · 2021-02-07 09:16:33 -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:11-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	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