SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge branch 'feature/workflow' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m40s
Details

Browse Source
This commit is contained in:
Stephan Richter
2026-01-03 22:17:39 +01:00
parent 8e53d3b306 8d2f3ef88e
commit cd25d23246
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitea/workflows/docker.yaml
View File

@@ -19,12 +19,13 @@ jobs:
- name: Store tag date - name: Store tag date
run: | 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 - name: Tag image for upload
run: | run: |
TAG=$(cat /tmp/tag) 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:${{ gitea.ref_name }}
docker tag umbrella ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG docker tag umbrella ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG
@@ -38,6 +39,5 @@ jobs:
- name: Push to registry - name: Push to registry
run: | run: |
TAG=$(cat /tmp/tag) TAG=$(cat /tmp/tag)
echo using '"'$TAG'"' as tag
docker push ${{ secrets.REGISTRY_PATH }}/umbrella:${{ gitea.ref_name }} docker push ${{ secrets.REGISTRY_PATH }}/umbrella:${{ gitea.ref_name }}
docker push ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG docker push ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG

34
Dockerfile
View File

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