diff --git a/Dockerfile b/Dockerfile index 8beda0d..34df41d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,27 +1,24 @@ -FROM alpine:3.22 AS svelte_build +FROM alpine:3.22 AS fuckit RUN apk add bash git npm RUN adduser -Dh /home/svelte svelte ADD . /home/svelte/Umbrella RUN chown -R svelte /home/svelte/Umbrella USER svelte WORKDIR /home/svelte/Umbrella/frontend -RUN npm install \ - && npm run build +RUN npm install && npm run build -FROM alpine AS java_build -COPY --from=svelte_build /home/svelte/Umbrella/frontend/dist /dist +FROM alpine AS damnit RUN echo waiting 1 min ; sleep 1m RUN apk add bash git gradle fontconfig font-opensans openjdk21-jre ADD . /Umbrella WORKDIR /Umbrella -RUN mv /dist web/src/main/resources/web +COPY --from=fuckit /home/svelte/Umbrella/frontend/dist web/src/main/resources/web RUN gradle --no-daemon build FROM alpine -COPY --from=java_build /Umbrella/backend/build/libs/backend.jar /backend.jar RUN apk add bash fontconfig font-opensans graphviz openjdk21-jre weasyprint RUN adduser -D umbrella -RUN mv /backend.jar /home/umbrella/jar/ +COPY --from=damnit /Umbrella/backend/build/libs/backend.jar /home/umbrella/jar/ RUN chown -R umbrella /home/umbrella COPY plantuml.jar /home/umbrella