Merge branch 'feature/workflow' into dev

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>

.gitea/workflows/docker.yaml

@@ -19,12 +19,13 @@ jobs:
 
       - name: Store tag date
         run: |
-          echo $(date +%Y%m%d_%H%M)_${{ gitea.ref_name }} > /tmp/tag
+          TAG=$(date +%Y%m%d_%H%M)_${{ gitea.ref_name }}
+          echo $TAG > /tmp/tag
+          echo Using '"'$TAG'"' as tag.
 
       - name: Tag image for upload
         run: |
           TAG=$(cat /tmp/tag)
-          echo using '"'$TAG'"' as tag
           docker tag umbrella ${{ secrets.REGISTRY_PATH }}/umbrella:${{ gitea.ref_name }}
           docker tag umbrella ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG
 
@@ -38,6 +39,5 @@ jobs:
       - name: Push to registry
         run: |
           TAG=$(cat /tmp/tag)
-          echo using '"'$TAG'"' as tag
           docker push ${{ secrets.REGISTRY_PATH }}/umbrella:${{ gitea.ref_name }}
           docker push ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG

Dockerfile

@@ -11,26 +11,26 @@ RUN npm install && npm run build
 
 
 
-#FROM alpine AS java_build
-#RUN apk add bash git gradle fontconfig font-opensans openjdk21-jre
-#ADD . /Umbrella
-#WORKDIR /Umbrella
-#COPY --from=svelte_build /home/svelte/Umbrella/frontend/dist web/src/main/resources/web
-#RUN gradle --no-daemon build
+FROM alpine AS java_build
+RUN apk add bash git gradle fontconfig font-opensans openjdk21-jre
+ADD . /Umbrella
+WORKDIR /Umbrella
+COPY --from=svelte_build /home/svelte/Umbrella/frontend/dist web/src/main/resources/web
+RUN gradle --no-daemon build
 
 
 
 
 
-#FROM alpine
-#RUN apk add bash fontconfig font-opensans graphviz openjdk21-jre weasyprint
-#RUN adduser -D umbrella
-#COPY --from=java_build /Umbrella/backend/build/libs/backend.jar /home/umbrella/jar/
-#RUN chown -R umbrella /home/umbrella
-#ADD https://github.com/plantuml/plantuml/releases/download/v1.2025.10/plantuml-1.2025.10.jar /home/umbrella/plantuml.jar
-#USER umbrella
-#WORKDIR /home/umbrella
-#RUN mkdir .config && ln -s /host/config.json .config/Umbrella.json
-#EXPOSE 80
-#CMD java -jar jar/backend.jar
+FROM alpine
+RUN apk add bash fontconfig font-opensans graphviz openjdk21-jre weasyprint
+RUN adduser -D umbrella
+COPY --from=java_build /Umbrella/backend/build/libs/backend.jar /home/umbrella/jar/
+RUN chown -R umbrella /home/umbrella
+ADD https://github.com/plantuml/plantuml/releases/download/v1.2025.10/plantuml-1.2025.10.jar /home/umbrella/plantuml.jar
+USER umbrella
+WORKDIR /home/umbrella
+RUN mkdir .config && ln -s /host/config.json .config/Umbrella.json
+EXPOSE 80
+CMD java -jar jar/backend.jar