Started workflow definition

2026-01-03 18:13:57 +01:00
parent 2f4c939e93
commit ff9b520449
4 changed files with 52 additions and 8 deletions
--- a/.gitea/workflows/docker.yaml
+++ b/.gitea/workflows/docker.yaml
@@ -7,9 +7,21 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Clone Repository
-        uses: actions/chekout@v4
+        uses: actions/checkout@v4

      - name: Build docker image
        run: |
          docker build -t umbrella .
-          docker tag umbrella ${{ secrets.REGISTRY_PATH }}/umbrella:latest
+          docker tag umbrella ${{ secrets.REGISTRY_PATH }}/umbrella:latest
+
+      - name: Login to registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.REGISTRY_PATH }}
+          username: ${{ secrets.REGISTRY_USER }}
+          password: ${{ secrets.REGISTRY_PASS }}
+
+      - name: Push to registry
+#        if: startsWith(gitea.ref, 'refs/tags/')
+        run: |
+          docker push ${{ secrets.REGISTRY_PATH }}/umbrella:latest
--- a/36
+++ b/36
@@ -0,0 +1,36 @@
+FROM alpine:3.22 AS svelte_build
+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
+
+
+
+
+
+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
+
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +0,0 @@
-FROM alpine:3.22 AS svelte_build
-RUN apk add bash git npm
-RUN adduser -Dh /home/svelte svelte
-USER svelte
-RUN pwd ; ls -al
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -9,6 +9,7 @@
  </head>
  <body>
    <div id="app"></div>
-    <script type="module" src="/src/main.js"></script>
+    <script type="module" src="/src/main.js">
+    </script>
  </body>
 </html>