Compare commits

...

29 Commits

Author SHA1 Message Date
3226241cd9 added workflow for podman
Some checks failed
Build Docker Image / Docker-Build (push) Failing after 7s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-12 23:09:49 +01:00
1c104af4a6 enabled debugging in dev branch
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m17s
Build Docker Image / Clean-Registry (push) Successful in 2s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-12 23:08:00 +01:00
fafe20e9e2 Merge branch 'module/journal' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m14s
Build Docker Image / Clean-Registry (push) Successful in 3s
2026-01-12 22:41:29 +01:00
83c19a7799 fixed Docker build
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-12 21:25:28 +01:00
a990903e3d Merge branch 'bugfix/wikipage' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 4m26s
Build Docker Image / Clean-Registry (push) Successful in 18s
2026-01-10 22:47:12 +01:00
bdb3443240 added another fix:
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m36s
Build Docker Image / Clean-Registry (push) Successful in 2s
- public wiki pages now show login form for guests
- private wiki pages now also show when opened via url (i.e. not by link within umbrella)

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-10 22:45:44 +01:00
a9a518e508 Merge branch 'module/journal' into dev 2026-01-10 22:26:24 +01:00
934aa9bc89 Merge branch 'bugfix/wikipage' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 4m57s
Build Docker Image / Clean-Registry (push) Successful in 23s
2026-01-10 15:26:58 +01:00
6406580385 added call to make.eldorado.srsoftware.de
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 3m7s
Build Docker Image / Clean-Registry (push) Successful in 1s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-05 23:15:50 +01:00
562c854a5b Merge branch 'bugfix/doc_template' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m35s
Build Docker Image / Clean-Registry (push) Successful in 2s
2026-01-05 10:35:51 +01:00
f4adf2ca3c bugfix: altered patch key for updating template in document
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-05 10:34:42 +01:00
73994d3a4e Merge branch 'bugfix/time_filtered_by_prj' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m40s
Build Docker Image / Clean-Registry (push) Successful in 3s
2026-01-05 08:49:30 +01:00
ac2f974e5a Merge branch 'workflow' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m31s
Build Docker Image / Clean-Registry (push) Successful in 3s
2026-01-03 23:55:31 +01:00
cd25d23246 Merge branch 'feature/workflow' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m40s
2026-01-03 22:17:39 +01:00
8d2f3ef88e fixed tagging
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-03 22:17:30 +01:00
8e53d3b306 Merge branch 'feature/workflow' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 41s
2026-01-03 22:14:28 +01:00
bd95c3d0c4 debugging
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-03 22:14:22 +01:00
421a350f57 Merge branch 'feature/workflow' into dev
Some checks failed
Build Docker Image / Docker-Build (push) Has been cancelled
2026-01-03 22:13:31 +01:00
dceb84669b debugging
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-03 22:13:21 +01:00
eaeb625d51 Merge branch 'feature/workflow' into dev
Some checks failed
Build Docker Image / Docker-Build (push) Failing after 2m32s
2026-01-03 22:03:10 +01:00
e980dbf884 working on tag creation
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-03 22:03:04 +01:00
dfa991b90a Merge branch 'feature/workflow' into dev
Some checks failed
Build Docker Image / Docker-Build (push) Failing after 2m31s
2026-01-03 21:41:56 +01:00
3b40250488 Merge branch 'feature/workflow' into dev
Some checks failed
Build Docker Image / Docker-Build (push) Failing after 2m29s
2026-01-03 21:37:50 +01:00
8e8992f534 Merge branch 'feature/workflow' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m39s
2026-01-03 21:32:59 +01:00
076efda195 Merge branch 'feature/workflow' into dev
Some checks failed
Build Docker Image / Docker-Build (push) Failing after 2m46s
2026-01-03 21:23:29 +01:00
5c1e802a6f Merge branch 'feature/workflow' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m42s
2026-01-03 21:13:42 +01:00
750e0f16e1 Merge branch 'feature/workflow' into dev
Some checks failed
Build Docker Image / Docker-Build (push) Failing after 2m43s
2026-01-03 21:07:38 +01:00
c06083476f Merge branch 'feature/workflow' into dev
Some checks failed
Build Docker Image / Docker-Build (push) Failing after 0s
2026-01-03 21:06:39 +01:00
f784ec6109 Merge branch 'main' into dev 2025-12-28 14:10:06 +01:00
5 changed files with 29 additions and 9 deletions

View File

@@ -41,10 +41,10 @@ jobs:
docker push ${{ secrets.REGISTRY_PATH }}/umbrella:${{ gitea.ref_name }}
docker push ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG
- name: Restart vj.srsoftware.de
if: github.ref == 'refs/heads/main'
- name: Restart umbrella.srsoftware.de
if: github.ref == 'refs/heads/dev'
run: |
curl -X POST -H "Authorization: Bearer ${{ secrets.MAKE_BEARER }}" -d vj_start https://make.srsoftware.de/launch
curl -X POST -H "Authorization: Bearer ${{ secrets.ELDORADO_MAKE_BEARER }}" -d umbrella_25_start https://make.eldorado.srsoftware.de/launch
Clean-Registry:
runs-on: ubuntu-latest

View File

@@ -0,0 +1,17 @@
name: Build Docker Image
run-name: ${{ gitea.actor }} building ${{ gitea.ref_name }}
on:
push:
branches:
- podman
jobs:
Docker-Build:
runs-on: ubuntu-latest
steps:
- name: Clone Repository
uses: actions/checkout@v4
- name: Build docker image
run: podman build -t umbrella .

View File

@@ -1,15 +1,15 @@
FROM alpine:3.22 AS svelte_build
RUN apk add bash git npm
RUN apk add npm
RUN adduser -Dh /home/svelte svelte
ADD . /home/svelte/Umbrella
ADD frontend /home/svelte/Umbrella/frontend
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
FROM alpine:3.22 AS java_build
RUN apk add gradle
ADD . /Umbrella
WORKDIR /Umbrella
COPY --from=svelte_build /home/svelte/Umbrella/frontend/dist web/src/main/resources/web
@@ -26,4 +26,4 @@ USER umbrella
WORKDIR /home/umbrella
RUN mkdir .config && ln -s /host/config.json .config/Umbrella.json
EXPOSE 80
CMD java -jar jar/backend.jar
CMD java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:9999 -jar jar/backend.jar

View File

@@ -207,7 +207,7 @@ public final class Document implements Mappable {
case SENDER: if (json.get(key) instanceof JSONObject nested) sender.patch(nested); break;
case STATE: state = State.of(json.getInt(key)).orElseThrow(() -> new UmbrellaException(HTTP_UNPROCESSABLE,"Invalid state")); break;
case POS: if (json.get(key) instanceof JSONObject nested) positions.patch(nested); break;
case TEMPLATE_ID: if (json.get(key) instanceof String templateId) template = templateId; break;
case TEMPLATE: if (json.get(key) instanceof String templateId) template = templateId; break;
default: key = null;
}
if (key != null) dirtyFields.add(key);

View File

@@ -1,4 +1,6 @@
<script>
import Login from "../../Components/Login.svelte";
import { onMount } from 'svelte';
import { useTinyRouter } from 'svelte-tiny-router';
import { api } from '../../urls.svelte';
@@ -45,3 +47,4 @@
</div>
</div>
{/if}
<Login />