diff --git a/Dockerfile b/Dockerfile index 9442b7d..c447a44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,11 +15,11 @@ RUN npm run build FROM nginx:1.24-alpine # nginx.conf 파일 가져와서 template안에 넣음 -COPY nginx.conf /etc/nginx/conf.d/default.conf.template - +#COPY nginx.conf /etc/nginx/conf.d/default.conf.template +COPY nginx.conf /etc/nginx/conf.d/default.conf # 쉘 명령어들 가져오고 권한 부여 -COPY docker-entrypoint.sh /usr/local/bin/ -RUN chmod +x /usr/local/bin/docker-entrypoint.sh +#COPY docker-entrypoint.sh /usr/local/bin/ +#RUN chmod +x /usr/local/bin/docker-entrypoint.sh # 빌드 이미지에서 생성된 dist 폴더를 nginx 이미지로 복사 @@ -27,5 +27,5 @@ COPY --from=build /app/dist /usr/share/nginx/html EXPOSE 80 -ENTRYPOINT ["docker-entrypoint.sh"] +#ENTRYPOINT ["docker-entrypoint.sh"] CMD ["nginx", "-g", "daemon off;"] diff --git a/docker-compose.yml b/docker-compose.yml index 9b26703..fc35643 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,11 +5,6 @@ services: image: hadoroke/lpilogue-fe:latest ports: - "3000:3000" - environment: - BE_HOST: "lpilogue-be" - BE_PORT: "8080" - REC_HOST: "lpilogue-rec" - REC_PORT: "5000" depends_on: - spring-boot-app - flask-app diff --git a/nginx.conf b/nginx.conf index 15f8c0c..0149ed9 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,6 +1,7 @@ server { listen 3000; server_name _; + resolver 127.0.0.11 valid=10s; location / { root /usr/share/nginx/html; @@ -8,10 +9,14 @@ server { } location /api/be { - proxy_pass http://${BE_HOST}:${BE_PORT}; + set $BE_HOST lpilogue-be + set $BE_PORT 8080; + proxy_pass http://$BE_HOST:$BE_PORT; } location /api/rec { - proxy_pass http://${REC_HOST}:${REC_PORT}; + set $REC_HOST lpilogue-rec + set $REC_PORT 5000; + proxy_pass http://$REC_HOST:$REC_PORT; } error_page 500 502 503 504 /50x.html;