diff --git a/Dockerfile b/Dockerfile index c964b6da..5b956ff4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,10 @@ WORKDIR /home/svelte/Umbrella/frontend RUN npm install && npm run build +FROM alpine:3.17 AS dia_source +RUN apk add dia + + FROM alpine:3.22 AS java_build RUN apk add gradle ADD . /Umbrella @@ -18,7 +22,10 @@ RUN gradle --no-daemon build FROM alpine RUN apk --no-cache add bash fontconfig font-opensans graphviz openjdk21-jre tzdata weasyprint \ + libxml2 cairo pango dbus-libs gmp nettle libxi tiff libjpeg-turbo xz-libs glib graphite2 gdk-pixbuf gtk+2.0 \ && adduser -D umbrella +COPY --from=dia_source /usr/bin/dia /usr/bin/dia +COPY --from=dia_source /usr/lib/dia/ /usr/lib/dia/ WORKDIR /home/umbrella EXPOSE 80 @@ -31,4 +38,4 @@ RUN mkdir .config \ && chmod a+rx plantuml.jar \ && chown -R umbrella . \ && ln -s /usr/share/zoneinfo/Europe/Berlin /etc/localtime -USER umbrella +USER umbrella \ No newline at end of file