From f276847f431887283ffecaa41d98874edff749fe Mon Sep 17 00:00:00 2001 From: TannedCung Date: Wed, 6 Dec 2023 17:14:37 +0700 Subject: [PATCH] Fix: nginx access BE static --- cope2n-fe/nginx.conf | 7 +++++-- docker-compose.yml | 30 ++++++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/cope2n-fe/nginx.conf b/cope2n-fe/nginx.conf index bf75f44..5646224 100644 --- a/cope2n-fe/nginx.conf +++ b/cope2n-fe/nginx.conf @@ -7,15 +7,18 @@ server { #access_log /var/log/nginx/host.access.log main; location ~ ^/api { - proxy_pass {{proxy_server}}; + proxy_pass {{proxy_server}}; } + location /static/drf_spectacular_sidecar/ { + alias /backend-static/drf_spectacular_sidecar/; + } + location / { root /usr/share/nginx/html; index index.html index.htm; try_files $uri /index.html; } - #error_page 404 /404.html; # redirect server error pages to the static page /50x.html diff --git a/docker-compose.yml b/docker-compose.yml index 0b097e4..291f5d3 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -40,7 +40,7 @@ services: context: cope2n-api dockerfile: Dockerfile ports: - - 9886:9000 + - 9880:9000 image: sidp/cope2n-be-fi-sbt container_name: "sidp-cope2n-be-ctel-manulife-sbt" environment: @@ -75,6 +75,7 @@ services: volumes: - ${HOST_MEDIA_FOLDER}:${MEDIA_ROOT} - ./cope2n-api:/app + - BE_static:/app/static # - sqlite_data:/app/ working_dir: /app # depends_on: @@ -177,6 +178,29 @@ services: - RABBITMQ_DEFAULT_USER=${RABBITMQ_DEFAULT_USER} - RABBITMQ_DEFAULT_PASS=${RABBITMQ_DEFAULT_PASS} # Front-end services + fe-sbt: + build: + context: cope2n-fe + shm_size: 10gb + dockerfile: Dockerfile + shm_size: 10gb + image: sidp/cope2n-fe-fi-sbt + container_name: "sidp-cope2n-fe-ctel-sbt" + privileged: true + ports: + - 9881:80 + depends_on: + be-ctel-manulife-sbt: + condition: service_started + be-celery-manulife-sbt: + condition: service_started + environment: + # - VITE_PROXY=http://be-ctel-manulife-sbt:${BASE_PORT} + - VITE_PROXY=http://42.96.42.13:9880 + - VITE_API_BASE_URL=http://fe-sbt:80 + volumes: + - BE_static:/backend-static + # Front-end services fe: build: context: cope2n-fe @@ -190,6 +214,7 @@ services: - 9882:80 environment: - VITE_PROXY=http://be-ctel-manulife-sbt:${BASE_PORT} + # - VITE_PROXY=http://42.96.42.13:9880 - VITE_API_BASE_URL=http://fe:80 networks: @@ -197,4 +222,5 @@ services: volumes: db_data: rabbitmq_data: - sqlite_data: \ No newline at end of file + sqlite_data: + BE_static: \ No newline at end of file