Compare commits

...

17 Commits

Author SHA1 Message Date
11d14afb00 working on curl request
Some checks failed
Build Docker Image / Docker-Build (push) Failing after 2m25s
Build Docker Image / Clean-Registry (push) Successful in 2s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-05 14:01:55 +01:00
77e546bd4b fixed typo
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-05 13:54:12 +01:00
beb58bbc36 added remote call to restart vj.srsoftware.de
Some checks failed
Build Docker Image / Docker-Build (push) Failing after 2m24s
Build Docker Image / Clean-Registry (push) Successful in 3s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-05 13:52:31 +01:00
b17275a623 dropped workflow branch from trigger list
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m40s
Build Docker Image / Clean-Registry (push) Successful in 4s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-03 23:54:41 +01:00
c1adce5a9e overhauling image creation and management
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:53:20 +01:00
a278f73c2e bugfix: forgot to load date
Some checks failed
Build Docker Image / Docker-Build (push) Failing after 2m29s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-03 21:41:51 +01:00
218d14090c improved date-tagging
Some checks failed
Build Docker Image / Docker-Build (push) Has been cancelled
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-03 21:37:39 +01:00
6f2bbdf635 trying to pass date via tmp
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-03 21:32:53 +01:00
8cff93c469 dropped reatagging, adding date tag
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-03 21:23:23 +01:00
1efed60696 working on image retagging
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-03 21:13:36 +01:00
c6dac692de fixed syntax
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-03 21:07:34 +01:00
202d7deeb9 trying to re-tag image
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-03 21:06:31 +01:00
fc2e484aec added dev to branches that trigger commit
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-03 20:41:51 +01:00
bedb275fe3 disabled build on every push
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-03 18:15:39 +01:00
ff9b520449 Started workflow definition
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m55s
2026-01-03 18:13:57 +01:00
2f4c939e93 created workflow file
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-03 15:47:40 +01:00
e596b0cdad starting Dockerfile for Git workflow
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-03 15:43:11 +01:00
3 changed files with 109 additions and 1 deletions

View File

@@ -0,0 +1,78 @@
name: Build Docker Image
run-name: ${{ gitea.actor }} building ${{ gitea.ref_name }}
on:
push:
branches:
- main
- dev
jobs:
Docker-Build:
runs-on: ubuntu-latest
steps:
- name: Clone Repository
uses: actions/checkout@v4
- name: Build docker image
run: docker build -t umbrella .
- name: Store tag date
run: |
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)
docker tag umbrella ${{ secrets.REGISTRY_PATH }}/umbrella:${{ gitea.ref_name }}
docker tag umbrella ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG
- 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
run: |
TAG=$(cat /tmp/tag)
docker push ${{ secrets.REGISTRY_PATH }}/umbrella:${{ gitea.ref_name }}
docker push ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG
- name: Restart vj.srsoftware.de
run: |
echo curl -X POST \
-H "Authorization: Bearer ${{ secrets.MAKE_BEARER }}" \
-d vj_start \
https://make.srsoftware.de/launch
Clean-Registry:
runs-on: ubuntu-latest
steps:
- name: Get tag list
run: |
TAGS="$(curl -s -u "${{ secrets.REGISTRY_USER }}:${{ secrets.REGISTRY_PASS }}" https://${{ secrets.REGISTRY_PATH }}/v2/umbrella/tags/list | jq -r ".tags[]")"
COUNT=$(echo "$TAGS" | wc -l)
if [ $COUNT -gt 10 ]; then
REMAIN=$((COUNT - 10))
echo "$TAGS" | head -n $REMAIN > /tmp/old_tags
else
echo less than 10 tags, skipping cleanup
echo "" > /tmp/old_tags
fi
- name: Remove tags
run: |
cat /tmp/old_tags | while read TAG; do
if [ -n "$TAG" ]; then
DIGEST=$(curl -u "${{ secrets.REGISTRY_USER }}:${{ secrets.REGISTRY_PASS }}" -sS -H 'Accept: application/vnd.docker.distribution.manifest.v2+json' -o /dev/null -w '%header{Docker-Content-Digest}' https://${{ secrets.REGISTRY_PATH }}/v2/umbrella/manifests/$TAG)
if [ -n "$DIGEST" ]; then
echo about to delete $TAG
curl -u "${{ secrets.REGISTRY_USER }}:${{ secrets.REGISTRY_PASS }}" -sS -X DELETE https://${{ secrets.REGISTRY_PATH }}/v2/umbrella/manifests/$DIGEST
else
echo failed to get digest for $TAG
fi
fi
done

29
Dockerfile Normal file
View File

@@ -0,0 +1,29 @@
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

View File

@@ -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>