Compare commits

...

3 Commits

Author SHA1 Message Date
67fcce8ab8 added default keycloak url 2024-05-30 19:37:05 +02:00
cb91aa6dd8 fixed keycloak 2024-05-30 19:35:17 +02:00
c81459e0aa try to get it to run again 2024-05-30 18:12:46 +02:00
2 changed files with 31 additions and 24 deletions

View File

@@ -25,7 +25,7 @@ help:
env:
@echo -e "POSTGRES_USER=\nPOSTGRES_PASSWORD=\n\n\nPOSTGRES_IP=database\nPOSTGRES_DB=Jodel" \
> .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\n\nKC_HOSTNAME=keycloak.local.anxietyprime.de\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
.PHONY = gitsync

View File

@@ -10,6 +10,10 @@ services:
KC_DB_SCHEMA: public
KC_DB_URL: jdbc:postgresql://keycloak-db/keycloak
#KC_HTTP_RELATIVE_PATH: /auth
PROXY_ADDRESS_FORWARDING: true
KC_PROXY: edge
KC_HOSTNAME_STRICT: false
KC_HTTP_ENABLED: true
expose:
- 8080
networks:
@@ -22,7 +26,8 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.keycloak.rule=Host(`keycloak.local.anxietyprime.de`)"
- "traefik.http.routers.keycloak.entrypoints=websecure"
- "traefik.http.routers.keycloak.tls.certresolver=letsencrypt"
- "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.routers.keycloak.service=keycloak"
healthcheck:
@@ -56,28 +61,29 @@ services:
restart: always
frontend:
image: hub.anxietyprime.de/swa-jodel/frontend:latest
container_name: swa-frontend
expose:
- 80
networks:
swa-public:
labels:
image: hub.anxietyprime.de/swa-jodel/frontend:latest
container_name: swa-frontend
expose:
- 80
networks:
swa-public:
labels:
- "traefik.enable=true"
- "traefik.http.routers.jodel.rule=Host(`jodel.local.anxietyprime.de`)"
- "traefik.http.routers.jodel.entrypoints=websecure"
- "traefik.http.routers.jodel.tls.certresolver=letsencrypt"
- "traefik.http.services.jodel.loadbalancer.server.port=80"
- "traefik.http.routers.jodel.service=jodel"
healthcheck:
test: ["CMD", "service", "nginx", "status"]
interval: 5s
timeout: 5s
retries: 30
depends_on:
backend:
condition: service_healthy
restart: always
- "traefik.http.routers.web-jodel.rule=Host(`jodel.local.anxietyprime.de`)"
- "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.providers=letsencrypt"
- "traefik.http.services.web-jodel.loadbalancer.server.port=80"
- "traefik.http.routers.web-jodel.service=web-jodel"
healthcheck:
test: echo ""
interval: 5s
timeout: 5s
retries: 30
depends_on:
backend:
condition: service_healthy
restart: always
backend:
image: hub.anxietyprime.de/swa-jodel/backend:latest
@@ -96,7 +102,8 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.api-jodel.rule=Host(`api.jodel.local.anxietyprime.de`)"
- "traefik.http.routers.api-jodel.entrypoints=websecure"
- "traefik.http.routers.api-jodel.tls.certresolver=letsencrypt"
- "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.routers.api-jodel.service=api-jodel"
healthcheck: