From ba7878e6bd629256a0c9185ad3bb582f404e9a75 Mon Sep 17 00:00:00 2001 From: Gyeongho Yang Date: Tue, 19 Nov 2024 00:42:40 +0900 Subject: [PATCH] fix: overwrite fe nginx configuration --- .../resources/validate/sum-of-probabilities.sql | 2 +- docker-compose.yaml | 17 +++++++++++++++++ frontend/nginx.conf | 10 ---------- 3 files changed, 18 insertions(+), 11 deletions(-) delete mode 100644 frontend/nginx.conf diff --git a/backend/src/test/resources/validate/sum-of-probabilities.sql b/backend/src/test/resources/validate/sum-of-probabilities.sql index a531c5c0..b34c03ee 100644 --- a/backend/src/test/resources/validate/sum-of-probabilities.sql +++ b/backend/src/test/resources/validate/sum-of-probabilities.sql @@ -1,4 +1,4 @@ -SELECT type, grade, part, level, position, SUM(probability) probabilities +SELECT type, grade, part, level, position, SUM(probability) probabilities FROM potential GROUP BY type, grade, part, level, position ORDER BY probabilities DESC; diff --git a/docker-compose.yaml b/docker-compose.yaml index 537f2785..dc411fa9 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -21,6 +21,23 @@ services: - traefik.http.routers.mapletool-fe.entrypoints=websecure - traefik.http.routers.mapletool-fe.tls=true - traefik.http.routers.mapletool-fe.tls.certresolver=letsencrypt + entrypoint: + - sh + - -euc + - | + cat < /etc/nginx/conf.d/default.conf + server { + listen 80; + server_name localhost; + root /usr/share/nginx/html; + + location / { + try_files $uri /index.html; + index index.html; + } + } + EOF + nginx -g 'daemon off;' be: image: openjdk:21-jdk-slim diff --git a/frontend/nginx.conf b/frontend/nginx.conf deleted file mode 100644 index 4a19dce2..00000000 --- a/frontend/nginx.conf +++ /dev/null @@ -1,10 +0,0 @@ -server { - listen 80; - server_name localhost; - root /usr/share/nginx/html; - - location / { - try_files $uri /index.html; - index index.html; - } -}