work on login-server and community-server config

This commit is contained in:
einhornimmond 2021-02-17 16:45:53 +01:00
parent 46daa8fc8a
commit 1323f16c17
5 changed files with 60 additions and 55 deletions

@ -1 +1 @@
Subproject commit 912c1f4d11f30bd5671c7e512fff02602c5d91b4 Subproject commit 16edef524cf19aaf8919f8e91a4bbff263ea1423

View File

@ -12,11 +12,11 @@ crypto.app_secret = 21ffbbc616fe # TODO auto-generate in docker build step
# nerve execute merit pool talk hockey basic win cargo spin disagree ethics swear price purchase say clutch decrease slow half forest reform cheese able # nerve execute merit pool talk hockey basic win cargo spin disagree ethics swear price purchase say clutch decrease slow half forest reform cheese able
# #
phpServer.url = http://community-server phpServer.url = http://localhost/
phpServer.host = community-server phpServer.host = community-server
phpServer.port = 80 phpServer.port = 80
loginServer.path = http://login-server loginServer.path = http://localhost/account
loginServer.default_locale = de loginServer.default_locale = de
loginServer.db.host = mariadb loginServer.db.host = mariadb
loginServer.db.name = gradido_login loginServer.db.name = gradido_login

View File

@ -29,19 +29,23 @@ services:
build: build:
context: ./login_server/ context: ./login_server/
target: login_server_debug target: login_server_debug
dockerfile: Dockerfile.debug
security_opt: security_opt:
- seccomp:unconfined - seccomp:unconfined
#cap-add:SYS_PTRACE cap_add:
- SYS_PTRACE
depends_on: depends_on:
- mariadb - mariadb
networks: networks:
- internal-net - internal-net
#- external-net
ports: ports:
- 1200:1200 - 1200:1200
- 1201:1201 - 1201:1201
volumes: volumes:
- ./configs/login_server:/etc/grd_login - ./configs/login_server:/etc/grd_login
- ./logs:/var/log/grd_login - ./logs:/var/log/grd_login
- conan:/root/.conan
# image: ocelotsocialnetwork/backend:development # image: ocelotsocialnetwork/backend:development
# build: # build:
# target: development # target: development
@ -58,4 +62,5 @@ services:
volumes: volumes:
frontend_node_modules: frontend_node_modules:
conan:
# backend_node_modules: # backend_node_modules:

View File

@ -58,8 +58,8 @@ services:
build: build:
context: ./login_server/ context: ./login_server/
target: login_server target: login_server
depends_on: #depends_on:
- mariadb #- mariadb
networks: networks:
- internal-net - internal-net
ports: ports:

@ -1 +1 @@
Subproject commit fa936dbc80860472a5cbc3d877cf130a0be916b3 Subproject commit bf1b6bcec0a208e7b4ec8c91b6b5e42c84131114