From 7d28b60f3f239b92d985f406791062b2a94147cc Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 8 Apr 2021 17:51:42 +0200 Subject: [PATCH] Added beamershow to deployment --- docker-compose/full_stack/docker-compose.yml | 169 ++++++++-------- docker-compose/full_stack/nginx.conf | 192 ++++++++++--------- 2 files changed, 195 insertions(+), 166 deletions(-) diff --git a/docker-compose/full_stack/docker-compose.yml b/docker-compose/full_stack/docker-compose.yml index a5518a4..4a9c9a1 100644 --- a/docker-compose/full_stack/docker-compose.yml +++ b/docker-compose/full_stack/docker-compose.yml @@ -1,80 +1,89 @@ -version: '3.3' -services: - backend_db: - image: postgres:11-alpine - environment: - POSTGRES_DB: lfk - POSTGRES_PASSWORD: changeme - POSTGRES_USER: lfk - volumes: - - ./db:/var/lib/postgresql/data - networks: - - default - backend_server: - image: registry.odit.services/lfk/backend:dev - environment: - APP_PORT: '4010' - APP_URL: http://localhost: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/frontend:dev - networks: - - default - volumes: - - ./env_frontend.js:/usr/share/nginx/html/env.js - selfservice: - image: registry.odit.services/lfk/selfservice:dev - networks: - - default - volumes: - - ./env_selfservice.js:/usr/share/nginx/html/env.js - document_server: - image: registry.odit.services/lfk/document-server:dev - environment: - APP_PORT: 4010 - NODE_ENV: production - networks: - - default - mailer: - image: registry.odit.services/lfk/mailer:dev - environment: - APP_PORT: 4010 - NODE_ENV: production - APP_URL: http://localhost:4010 - MAIL_FROM: h2ifdztl43xaipix@ethereal.email - MAIL_PASSWORD: BRG3EYpns67hrd6zMC - MAIL_PORT: '587' - MAIL_SERVER: smtp.ethereal.email - MAIL_USER: h2ifdztl43xaipix@ethereal.email - networks: - - default - proxy: - image: nginx:latest - ports: - - 4010:80 - networks: - - default - depends_on: - - backend_server - - frontend_server - - document_server - - mailer - volumes: - - ./nginx.conf:/etc/nginx/nginx.conf -networks: - default: +version: '3.3' +services: + backend_db: + image: postgres:11-alpine + environment: + POSTGRES_DB: lfk + POSTGRES_PASSWORD: changeme + POSTGRES_USER: lfk + volumes: + - ./db:/var/lib/postgresql/data + networks: + - default + backend_server: + image: registry.odit.services/lfk/backend:latest + environment: + APP_PORT: '4010' + APP_URL: http://localhost: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/frontend:latest + networks: + - default + volumes: + - ./env_frontend.js:/usr/share/nginx/html/env.js + selfservice: + image: registry.odit.services/lfk/selfservice:latest + networks: + - default + volumes: + - ./env_selfservice.js:/usr/share/nginx/html/env.js + document_server: + image: registry.odit.services/lfk/document-server:latest + environment: + APP_PORT: 4010 + NODE_ENV: production + networks: + - default + mailer: + image: registry.odit.services/lfk/mailer:latest + environment: + APP_PORT: 4010 + NODE_ENV: production + APP_URL: http://localhost:4010 + MAIL_FROM: h2ifdztl43xaipix@ethereal.email + MAIL_PASSWORD: BRG3EYpns67hrd6zMC + MAIL_PORT: '587' + MAIL_SERVER: smtp.ethereal.email + MAIL_USER: h2ifdztl43xaipix@ethereal.email + networks: + - default + beamershow: + image: registry.odit.services/lfk/beamershow:latest + networks: + - default + logging: + driver: "json-file" + options: + max-file: "1" + max-size: "1m" + proxy: + image: nginx:latest + ports: + - 4010:80 + networks: + - default + depends_on: + - backend_server + - frontend_server + - document_server + - mailer + volumes: + - ./nginx.conf:/etc/nginx/nginx.conf +networks: + default: diff --git a/docker-compose/full_stack/nginx.conf b/docker-compose/full_stack/nginx.conf index 559157a..2108a5c 100644 --- a/docker-compose/full_stack/nginx.conf +++ b/docker-compose/full_stack/nginx.conf @@ -1,87 +1,107 @@ -worker_processes 1; - -events { worker_connections 1024; } - -http { - server { - listen 80; #Port that the nginx server listens on - - #Location / redicts every url not specified in another location to the frontend container - location / { - proxy_pass http://frontend_server:80/; - proxy_redirect off; - - #Set the headers needed by the frontend for smooth proxying - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Host $server_name; - } - - #Location /api redicts every api related url to the backend container. - location /api { - proxy_pass http://backend_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; - 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; - } - - #Location /mailer redicts every mailing related url to the mailer container. - location /mailer { - rewrite /mailer/(.*) /$1 break; - proxy_pass http://mailer: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; - } - - #Location /selfservice redicts every selfservice related url to the selfservice container. - location /selfservice { - rewrite /selfservice/(.*) /$1 break; - proxy_pass http://selfservice:80; - 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-Prefix /selfservice; - 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; - } - - #Redirect selfservice without trailing slash to selfservice/ - location =/selfservice{ - return 301 /selfservice/; - } - } +worker_processes 1; + +events { worker_connections 1024; } + +http { + server { + listen 80; #Port that the nginx server listens on + + #Location / redicts every url not specified in another location to the frontend container + location / { + proxy_pass http://frontend_server:80/; + proxy_redirect off; + + #Set the headers needed by the frontend for smooth proxying + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Host $server_name; + } + + #Location /api redicts every api related url to the backend container. + location /api { + proxy_pass http://backend_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; + 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; + } + + #Location /mailer redicts every mailing related url to the mailer container. + location /mailer { + rewrite /mailer/(.*) /$1 break; + proxy_pass http://mailer: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; + } + + #Location /selfservice redicts every selfservice related url to the selfservice container. + location /selfservice { + rewrite /selfservice/(.*) /$1 break; + proxy_pass http://selfservice:80; + 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-Prefix /selfservice; + 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; + } + + #Redirect selfservice without trailing slash to selfservice/ + location =/selfservice{ + return 301 /selfservice/; + } + + #Location /beamershow redicts every beamershow related url to the beamershow container. + location /beamershow { + proxy_pass http://beamershow:80; + 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-Prefix /beamershow; + 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; + } + + #Redirect beamershow without trailing slash to beamershow/ + location =/beamershow{ + return 301 /beamershow/; + } + } } \ No newline at end of file