mocode-software/meldestelle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust Caddyfile configuration and prevent Caddy template action conflicts in frontend runtime setup
All checks were successful
Build and Publish Docker Images / build-and-push (., backend/infrastructure/gateway/Dockerfile, api-gateway, api-gateway) (push) Successful in 7m55s
Details
Build and Publish Docker Images / build-and-push (., backend/services/ping/Dockerfile, ping-service, ping-service) (push) Successful in 6m56s
Details
Build and Publish Docker Images / build-and-push (., config/docker/caddy/web-app/Dockerfile, web-app, web-app) (push) Successful in 1m55s
Details
Build and Publish Docker Images / build-and-push (., config/docker/keycloak/Dockerfile, keycloak, keycloak) (push) Successful in 1m37s
Details

Browse Source
This commit is contained in:
Stefan Mogeritsch 2026-03-14 21:16:22 +01:00
parent c67b285c97
commit a202d3d817
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/docker/caddy/web-app/Caddyfile
View File

@ -1,9 +1,7 @@
{ {
auto_https off auto_https off
servers {
metrics metrics
} }
}
:4000 { :4000 {
root * /usr/share/caddy root * /usr/share/caddy

5
frontend/shells/meldestelle-portal/src/jsMain/resources/index.html
View File

@ -33,11 +33,12 @@
const config = JSON.parse(configJson); const config = JSON.parse(configJson);
const params = new URLSearchParams(window.location.search); const params = new URLSearchParams(window.location.search);
const tmplPrefix = '{' + '{'; // Verhindert, dass Caddy '{{' als Template-Action interpretiert
const apiFromCaddy = config.apiBaseUrl; const apiFromCaddy = config.apiBaseUrl;
const apiOverride = params.get('apiBaseUrl'); const apiOverride = params.get('apiBaseUrl');
globalThis.API_BASE_URL = apiOverride globalThis.API_BASE_URL = apiOverride
? apiOverride.replace(/\/$/, '') ? apiOverride.replace(/\/$/, '')
: (apiFromCaddy && !apiFromCaddy.startsWith('{{') : (apiFromCaddy && !apiFromCaddy.startsWith(tmplPrefix)
? apiFromCaddy.replace(/\/$/, '') ? apiFromCaddy.replace(/\/$/, '')
: 'http://' + window.location.origin.replace(/\/$/, '')); : 'http://' + window.location.origin.replace(/\/$/, ''));
@ -45,7 +46,7 @@
const kcOverride = params.get('keycloakUrl'); const kcOverride = params.get('keycloakUrl');
globalThis.KEYCLOAK_URL = kcOverride globalThis.KEYCLOAK_URL = kcOverride
? kcOverride.replace(/\/$/, '') ? kcOverride.replace(/\/$/, '')
: (kcFromCaddy && !kcFromCaddy.startsWith('{{') : (kcFromCaddy && !kcFromCaddy.startsWith(tmplPrefix)
? kcFromCaddy.replace(/\/$/, '') ? kcFromCaddy.replace(/\/$/, '')
: 'http://' + window.location.hostname + ':8180'); : 'http://' + window.location.hostname + ':8180');