Skip to content

Commit

Permalink
Merge pull request #1 from pgiles/pgiles-patch-1
Browse files Browse the repository at this point in the history
Use docker_plantuml as basis for creating image
  • Loading branch information
pgiles authored Aug 20, 2021
2 parents b24752f + f40ba59 commit 4f149f3
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
20 changes: 10 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 $*"

0 comments on commit 4f149f3

Please sign in to comment.