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

added hostnames to seperate env file

Browse Source
This commit is contained in:
Timo Schneider
2024-06-13 09:16:37 +02:00
parent 40b2b48a12
commit 0dfcc51e01
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -12,7 +12,7 @@ FRONTEND=swa-jodel/frontend:latest
BACKEND=swa-jodel/backend:latest BACKEND=swa-jodel/backend:latest
DATABASE=swa-jodel/database:latest DATABASE=swa-jodel/database:latest
include $(ROOT_DIR).hostname -include $(ROOT_DIR).hostname
help: help:
@echo "[HELP]" @echo "[HELP]"
@@ -29,7 +29,7 @@ env:
> $(ROOT_DIR).backend-env > $(ROOT_DIR).backend-env
@echo "POSTGRES_USER=\nPOSTGRES_PASSWORD=\n\nKEYCLOAK_ADMIN=\nKEYCLOAK_ADMIN_PASSWORD=\n\n\nPOSTGRES_IP=10.42.0.11\nPOSTGRES_DB=keycloak\nKC_DB_URL_DATABASE=\$$POSTGRES_IP\nKC_DB_USERNAME=\$$POSTGRES_USER\nKC_DB_PASSWORD=\$$POSTGRES_PASSWORD" \ @echo "POSTGRES_USER=\nPOSTGRES_PASSWORD=\n\nKEYCLOAK_ADMIN=\nKEYCLOAK_ADMIN_PASSWORD=\n\n\nPOSTGRES_IP=10.42.0.11\nPOSTGRES_DB=keycloak\nKC_DB_URL_DATABASE=\$$POSTGRES_IP\nKC_DB_USERNAME=\$$POSTGRES_USER\nKC_DB_PASSWORD=\$$POSTGRES_PASSWORD" \
> $(ROOT_DIR).keycloak-env > $(ROOT_DIR).keycloak-env
@echo "KC_HOSTNAME=keycloak.local.anxietyprime.de" \ @echo "KC_HOSTNAME=keycloak.local.anxietyprime.de\nJODEL_HOSTNAME=jodel.local.anxietyprime.de\nAPI_HOSTNAME=api.jodel.local.anxietyprime.de" \
> $(ROOT_DIR).hostname > $(ROOT_DIR).hostname
.PHONY = gitsync .PHONY = gitsync

12
docker-compose.yaml
View File

@@ -25,9 +25,9 @@ services:
ipv4_address: 10.42.0.10 ipv4_address: 10.42.0.10
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.keycloak.rule=Host(`keycloak.local.anxietyprime.de`)" - "traefik.http.routers.keycloak.rule=Host($KC_HOSTNAME)"
- "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=$KC_HOSTNAME"
# - "traefik.http.routers.keycloak.tls.certresolver=letsencrypt" # - "traefik.http.routers.keycloak.tls.certresolver=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"
@@ -71,9 +71,9 @@ services:
swa-public: swa-public:
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.web-jodel.rule=Host(`jodel.local.anxietyprime.de`)" - "traefik.http.routers.web-jodel.rule=Host($JODEL_HOSTNAME)"
- "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_HOSTNAME"
# - "traefik.http.routers.web-jodel.tls.certresolver=letsencrypt" # - "traefik.http.routers.web-jodel.tls.certresolver=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"
@@ -103,9 +103,9 @@ services:
ipv4_address: 10.42.0.18 ipv4_address: 10.42.0.18
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.api-jodel.rule=Host(`api.jodel.local.anxietyprime.de`)" - "traefik.http.routers.api-jodel.rule=Host($API_HOSTNAME)"
- "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_HOSTNAME"
# - "traefik.http.routers.api-jodel.tls.certresolver=letsencrypt" # - "traefik.http.routers.api-jodel.tls.certresolver=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"