From 1696a422d3aecaa51bc74d6f2eb15e34a3e56bf7 Mon Sep 17 00:00:00 2001
From: Paul Giles <pgiles@users.noreply.github.com>
Date: Thu, 19 Aug 2021 18:15:09 -0700
Subject: [PATCH 1/2] Use docker_plantuml as basis for creating image

---
 Dockerfile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index aa89e3a..f2f8bda 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
-FROM ubuntu:groovy
-# Current plantUML version at time of switch: PlantUML Version 1.2020.02
-# Note: GitHub Actions must be run by the default Docker user (root). Ensure your Dockerfile does not set the USER instruction, otherwise you will not be able to access GITHUB_WORKSPACE.
-
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199
-RUN mkdir -p /usr/share/man/man1
-
-RUN apt-get -qy update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -yq install plantuml graphviz git fonts-ipafont fonts-ipaexfont && \
-    rm -rf /var/lib/apt/lists/*
+FROM openjdk:14-jdk-alpine3.10
+ENV PLANTUML_VERSION=1.2021.7
+ENV LANG en_US.UTF-8
+RUN \
+  apk add --no-cache graphviz wget ca-certificates && \
+  apk add --no-cache graphviz wget ca-certificates ttf-dejavu fontconfig && \
+  wget --no-check-certificate "http://downloads.sourceforge.net/project/plantuml/${PLANTUML_VERSION}/plantuml.${PLANTUML_VERSION}.jar" -O plantuml.jar && \
+  apk del wget ca-certificates
+RUN ["java", "-Djava.awt.headless=true", "-jar", "/plantuml.jar", "-version"]
+RUN ["dot", "-version"]
 
 COPY entrypoint.sh /entrypoint.sh
 

From f40ba59ee16d34c3b688529528dfc561527e055e Mon Sep 17 00:00:00 2001
From: Paul Giles <pgiles@users.noreply.github.com>
Date: Thu, 19 Aug 2021 18:17:08 -0700
Subject: [PATCH 2/2] entrypoint that works with github actions

---
 entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index d1ead9a..e12b290 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -2,4 +2,4 @@
 
 # `$*` expands the `args` supplied in an `array` individually 
 # or splits `args` in a string separated by whitespace.
-sh -c "plantuml $*"
+sh -c "java -Djava.awt.headless=true -jar /plantuml.jar $*"