Compare commits
21 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6406580385 | |||
| 562c854a5b | |||
| f4adf2ca3c | |||
| 73994d3a4e | |||
| ac2f974e5a | |||
| cd25d23246 | |||
| 8d2f3ef88e | |||
| 8e53d3b306 | |||
| bd95c3d0c4 | |||
| 421a350f57 | |||
| dceb84669b | |||
| eaeb625d51 | |||
| e980dbf884 | |||
| dfa991b90a | |||
| 3b40250488 | |||
| 8e8992f534 | |||
| 076efda195 | |||
| 5c1e802a6f | |||
| 750e0f16e1 | |||
| c06083476f | |||
| f784ec6109 |
@@ -41,6 +41,11 @@ jobs:
|
|||||||
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
|
||||||
|
|
||||||
|
- name: Restart umbrella.srsoftware.de
|
||||||
|
if: github.ref == 'refs/heads/dev'
|
||||||
|
run: |
|
||||||
|
curl -X POST -H "Authorization: Bearer ${{ secrets.ELDORADO_MAKE_BEARER }}" -d umbrella_25_start https://make.eldorado.srsoftware.de/launch
|
||||||
|
|
||||||
Clean-Registry:
|
Clean-Registry:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
FROM alpine:3.22 AS svelte_build
|
FROM alpine:3.22 AS svelte_build
|
||||||
RUN apk add bash git npm
|
RUN apk add npm
|
||||||
RUN adduser -Dh /home/svelte svelte
|
RUN adduser -Dh /home/svelte svelte
|
||||||
ADD . /home/svelte/Umbrella
|
ADD . /home/svelte/Umbrella
|
||||||
RUN chown -R svelte /home/svelte/Umbrella
|
RUN chown -R svelte /home/svelte/Umbrella
|
||||||
@@ -9,7 +9,7 @@ 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 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
|
||||||
|
|||||||
@@ -207,7 +207,7 @@ public final class Document implements Mappable {
|
|||||||
case SENDER: if (json.get(key) instanceof JSONObject nested) sender.patch(nested); break;
|
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 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 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;
|
default: key = null;
|
||||||
}
|
}
|
||||||
if (key != null) dirtyFields.add(key);
|
if (key != null) dirtyFields.add(key);
|
||||||
|
|||||||
Reference in New Issue
Block a user