Skip to content
Snippets Groups Projects
Commit 86799a2c authored by Yannis Barlas's avatar Yannis Barlas
Browse files

Merge branch 'server-client-port' into 'main'

fix(*): let server know about client variables

See merge request kotahi/kotahi!158
parents ba7c6505 9a48575b
No related branches found
No related tags found
No related merge requests found
...@@ -21,6 +21,9 @@ services: ...@@ -21,6 +21,9 @@ services:
- POSTGRES_USER=${POSTGRES_USER} - POSTGRES_USER=${POSTGRES_USER}
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
- PUBSWEET_SECRET=${PUBSWEET_SECRET} - PUBSWEET_SECRET=${PUBSWEET_SECRET}
- CLIENT_PROTOCOL=${CLIENT_PROTOCOL}
- CLIENT_HOST=${CLIENT_HOST}
- CLIENT_PORT=${CLIENT_PORT}
- SERVER_PROTOCOL=${SERVER_PROTOCOL} - SERVER_PROTOCOL=${SERVER_PROTOCOL}
- SERVER_HOST=${SERVER_HOST} - SERVER_HOST=${SERVER_HOST}
- SERVER_PORT=${SERVER_PORT} - SERVER_PORT=${SERVER_PORT}
......
...@@ -60,6 +60,9 @@ services: ...@@ -60,6 +60,9 @@ services:
- POSTGRES_HOST=db - POSTGRES_HOST=db
- POSTGRES_PORT=5432 - POSTGRES_PORT=5432
- PUBSWEET_SECRET=${PUBSWEET_SECRET:-dev_secret} - PUBSWEET_SECRET=${PUBSWEET_SECRET:-dev_secret}
- CLIENT_PROTOCOL=${CLIENT_PROTOCOL:-http}
- CLIENT_HOST=${CLIENT_HOST:-localhost}
- CLIENT_PORT=${CLIENT_PORT:-4000}
- ORCID_CLIENT_ID=${ORCID_CLIENT_ID} - ORCID_CLIENT_ID=${ORCID_CLIENT_ID}
- ORCID_CLIENT_SECRET=${ORCID_CLIENT_SECRET} - ORCID_CLIENT_SECRET=${ORCID_CLIENT_SECRET}
volumes: volumes:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment