SWA-Project/deploy
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed keycloak

Browse Source
This commit is contained in:
Timo Schneider
2024-05-30 19:35:17 +02:00
parent c81459e0aa
commit cb91aa6dd8
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -25,7 +25,7 @@ help:
env: env:
@echo -e "POSTGRES_USER=\nPOSTGRES_PASSWORD=\n\n\nPOSTGRES_IP=database\nPOSTGRES_DB=Jodel" \ @echo -e "POSTGRES_USER=\nPOSTGRES_PASSWORD=\n\n\nPOSTGRES_IP=database\nPOSTGRES_DB=Jodel" \
> .backend-env > .backend-env
@echo -e "POSTGRES_USER=\nPOSTGRES_PASSWORD=\n\nKEYCLOAK_ADMIN=\nKEYCLOAK_ADMIN_PASSWORD=\n\n\nPOSTGRES_IP=keycloak-db\nPOSTGRES_DB=keycloak\nKC_DB_URL_DATABASE=\$$POSTGRES_IP\nKC_DB_USERNAME=\$$POSTGRES_USER\nKC_DB_PASSWORD=\$$POSTGRES_PASSWORD" \ @echo -e "POSTGRES_USER=\nPOSTGRES_PASSWORD=\n\nKEYCLOAK_ADMIN=\nKEYCLOAK_ADMIN_PASSWORD=\n\nKC_HOSTNAME=\n\n\nPOSTGRES_IP=keycloak-db\nPOSTGRES_DB=keycloak\nKC_DB_URL_DATABASE=\$$POSTGRES_IP\nKC_DB_USERNAME=\$$POSTGRES_USER\nKC_DB_PASSWORD=\$$POSTGRES_PASSWORD" \
> .keycloak-env > .keycloak-env
.PHONY = gitsync .PHONY = gitsync

7
docker-compose.yaml
View File

@@ -11,7 +11,9 @@ services:
KC_DB_URL: jdbc:postgresql://keycloak-db/keycloak KC_DB_URL: jdbc:postgresql://keycloak-db/keycloak
#KC_HTTP_RELATIVE_PATH: /auth #KC_HTTP_RELATIVE_PATH: /auth
PROXY_ADDRESS_FORWARDING: true PROXY_ADDRESS_FORWARDING: true
KEYCLOAK_HOSTNAME: keycloak.local.anxietyprime.de KC_PROXY: edge
KC_HOSTNAME_STRICT: false
KC_HTTP_ENABLED: true
expose: expose:
- 8080 - 8080
networks: networks:
@@ -25,6 +27,7 @@ services:
- "traefik.http.routers.keycloak.rule=Host(`keycloak.local.anxietyprime.de`)" - "traefik.http.routers.keycloak.rule=Host(`keycloak.local.anxietyprime.de`)"
- "traefik.http.routers.keycloak.entrypoints=websecure" - "traefik.http.routers.keycloak.entrypoints=websecure"
- "traefik.http.routers.keycloak.tls.domains[0].main=keycloak.local.anxietyprime.de" - "traefik.http.routers.keycloak.tls.domains[0].main=keycloak.local.anxietyprime.de"
# - "traefik.http.routers.keycloak-web.tls.providers=letsencrypt"
- "traefik.http.services.keycloak.loadbalancer.server.port=8080" - "traefik.http.services.keycloak.loadbalancer.server.port=8080"
- "traefik.http.routers.keycloak.service=keycloak" - "traefik.http.routers.keycloak.service=keycloak"
healthcheck: healthcheck:
@@ -69,6 +72,7 @@ services:
- "traefik.http.routers.web-jodel.rule=Host(`jodel.local.anxietyprime.de`)" - "traefik.http.routers.web-jodel.rule=Host(`jodel.local.anxietyprime.de`)"
- "traefik.http.routers.web-jodel.entrypoints=websecure" - "traefik.http.routers.web-jodel.entrypoints=websecure"
- "traefik.http.routers.web-jodel.tls.domains[0].main=jodel.local.anxietyprime.de" - "traefik.http.routers.web-jodel.tls.domains[0].main=jodel.local.anxietyprime.de"
# - "traefik.http.routers.web-jodel.tls.providers=letsencrypt"
- "traefik.http.services.web-jodel.loadbalancer.server.port=80" - "traefik.http.services.web-jodel.loadbalancer.server.port=80"
- "traefik.http.routers.web-jodel.service=web-jodel" - "traefik.http.routers.web-jodel.service=web-jodel"
healthcheck: healthcheck:
@@ -99,6 +103,7 @@ services:
- "traefik.http.routers.api-jodel.rule=Host(`api.jodel.local.anxietyprime.de`)" - "traefik.http.routers.api-jodel.rule=Host(`api.jodel.local.anxietyprime.de`)"
- "traefik.http.routers.api-jodel.entrypoints=websecure" - "traefik.http.routers.api-jodel.entrypoints=websecure"
- "traefik.http.routers.api-jodel.tls.domains[0].main=api.jodel.local.anxietyprime.de" - "traefik.http.routers.api-jodel.tls.domains[0].main=api.jodel.local.anxietyprime.de"
# - "traefik.http.routers.api-jodel.tls.providers=letsencrypt"
- "traefik.http.services.api-jodel.loadbalancer.server.port=8080" - "traefik.http.services.api-jodel.loadbalancer.server.port=8080"
- "traefik.http.routers.api-jodel.service=api-jodel" - "traefik.http.routers.api-jodel.service=api-jodel"
healthcheck: healthcheck: