Merge branch 'development' of https://git.wmi.amu.edu.pl/s459309/system-pri into development
This commit is contained in:
commit
e97e92e8b7
@ -14,4 +14,6 @@ RUN pip install -r requirements.txt
|
|||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
|
RUN flask db stamp head
|
||||||
RUN flask db migrate
|
RUN flask db migrate
|
||||||
|
RUN flask db upgrade
|
||||||
|
@ -34,7 +34,7 @@ services:
|
|||||||
# depends_on:
|
# depends_on:
|
||||||
# - nginx_server
|
# - nginx_server
|
||||||
ports:
|
ports:
|
||||||
- "9998:80"
|
- "80:80"
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
db_data:
|
db_data:
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
upstream web_app {
|
||||||
|
server backend_service:5000;
|
||||||
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 80;
|
listen 80;
|
||||||
|
|
||||||
@ -6,4 +10,11 @@ server {
|
|||||||
index index.html index.htm;
|
index index.html index.htm;
|
||||||
try_files $uri $uri/ /index.html =404;
|
try_files $uri $uri/ /index.html =404;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
location ~ /api/ {
|
||||||
|
proxy_pass http://web_app;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_redirect off;
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user