diff --git a/docker-compose/full_stack/docker-compose.yml b/docker-compose/full_stack/docker-compose.yml index e6cb3bb..6aaad43 100644 --- a/docker-compose/full_stack/docker-compose.yml +++ b/docker-compose/full_stack/docker-compose.yml @@ -14,21 +14,38 @@ services: image: registry.odit.services/lfk/backend:dev environment: APP_PORT: '4010' + APP_URL: http://10.1.1.90:4010 DB_HOST: backend_db DB_NAME: lfk DB_PASSWORD: changeme DB_PORT: '5432' DB_TYPE: postgres DB_USER: lfk + MAIL_FROM: h2ifdztl43xaipix@ethereal.email + MAIL_PASSWORD: BRG3EYpns67hrd6zMC + MAIL_PORT: '587' + MAIL_SERVER: smtp.ethereal.email + MAIL_USER: h2ifdztl43xaipix@ethereal.email NODE_ENV: production + POSTALCODE_COUNTRYCODE: DE + SEED_TEST_DATA: 'true' networks: - default frontend_server: - image: registry.odit.services/lfk/backend:dev + image: registry.odit.services/lfk/frontend:dev networks: - default volumes: - ./env.js:/usr/share/nginx/html/env.js + document_server: + image: registry.odit.services/lfk/document-server:dev + ports: + - 4011:4010 + environment: + APP_PORT: 4010 + NODE_ENV: production + networks: + - default proxy: image: nginx:latest ports: @@ -36,10 +53,10 @@ services: networks: - default depends_on: - - backend - - frontend + - backend_server + - frontend_server + - document_server volumes: - ./nginx.conf:/etc/nginx/nginx.conf networks: default: - driver: overlay diff --git a/docker-compose/full_stack/nginx.conf b/docker-compose/full_stack/nginx.conf index f094548..fc3bcbb 100644 --- a/docker-compose/full_stack/nginx.conf +++ b/docker-compose/full_stack/nginx.conf @@ -32,5 +32,20 @@ http { proxy_set_header X-Forwarded-Host $server_name; proxy_set_header X-Forwarded-Prefix /api; } + + #Location /documents redicts every documents generation related url to the document-server container. + location /documents { + rewrite /documents/(.*) /$1 break; + proxy_pass http://document_server:4010; + proxy_redirect off; + + #Set the headers needed by the backend for smooth proxying + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection keep-alive; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $server_name; + } } } \ No newline at end of file