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

moved hostname to separate file

Browse Source
This commit is contained in:
Timo Schneider
2024-06-11 18:04:43 +02:00
parent 32aa6d1534
commit 89b4300856
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -24,9 +24,11 @@ help:
.PHONY = env .PHONY = env
env: env:
@echo "POSTGRES_USER=\nPOSTGRES_PASSWORD=\n\n\nPOSTGRES_IP=10.42.0.19\nPOSTGRES_DB=Jodel" \ @echo "POSTGRES_USER=\nPOSTGRES_PASSWORD=\n\n\nPOSTGRES_IP=10.42.0.19\nPOSTGRES_DB=Jodel" \
> .backend-env > $(ROOT_DIR).backend-env
@echo "POSTGRES_USER=\nPOSTGRES_PASSWORD=\n\nKEYCLOAK_ADMIN=\nKEYCLOAK_ADMIN_PASSWORD=\n\n\nKC_HOSTNAME=keycloak.local.anxietyprime.de\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" \
> .keycloak-env > $(ROOT_DIR).keycloak-env
@echo "KC_HOSTNAME=keycloak.local.anxietyprime.de" \
> $(ROOT_DIR).hostname
.PHONY = gitsync .PHONY = gitsync
gitsync: remove_dependencies gitsync: remove_dependencies

4
docker-compose.yaml
View File

@@ -2,9 +2,10 @@ services:
keycloak: keycloak:
image: hub.anxietyprime.de/swa-jodel/keycloak:latest image: hub.anxietyprime.de/swa-jodel/keycloak:latest
container_name: swa-keycloak container_name: swa-keycloak
command: ["start-dev"] command: ["start"]
env_file: env_file:
- ./.keycloak-env - ./.keycloak-env
- ./.hostname
environment: environment:
KC_DB: postgres KC_DB: postgres
KC_DB_SCHEMA: public KC_DB_SCHEMA: public
@@ -45,6 +46,7 @@ services:
container_name: swa-keycloak-db container_name: swa-keycloak-db
env_file: env_file:
- ./.keycloak-env - ./.keycloak-env
- ./.hostname
volumes: volumes:
- ./keycloak-db/:/var/lib/postgresql/data - ./keycloak-db/:/var/lib/postgresql/data
expose: expose: