Merge branch 'dia' into dev
This commit is contained in:
@@ -8,6 +8,10 @@ WORKDIR /home/svelte/Umbrella/frontend
|
|||||||
RUN npm install && npm run build
|
RUN npm install && npm run build
|
||||||
|
|
||||||
|
|
||||||
|
FROM alpine:3.17 AS dia_source
|
||||||
|
RUN apk add dia
|
||||||
|
|
||||||
|
|
||||||
FROM alpine:3.22 AS java_build
|
FROM alpine:3.22 AS java_build
|
||||||
RUN apk add gradle
|
RUN apk add gradle
|
||||||
ADD . /Umbrella
|
ADD . /Umbrella
|
||||||
@@ -18,7 +22,10 @@ RUN gradle --no-daemon build
|
|||||||
|
|
||||||
FROM alpine
|
FROM alpine
|
||||||
RUN apk --no-cache add bash fontconfig font-opensans graphviz openjdk21-jre tzdata weasyprint \
|
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
|
&& 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
|
WORKDIR /home/umbrella
|
||||||
|
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
|
|||||||
@@ -109,7 +109,7 @@
|
|||||||
<style>
|
<style>
|
||||||
:global {
|
:global {
|
||||||
.amount{ text-align: right }
|
.amount{ text-align: right }
|
||||||
.nowrap{ whitespace: nowrap }
|
.nowrap{ white-space: nowrap }
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user