diff --git a/Dockerfile b/Dockerfile index edc4ce435..49bff3177 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,9 +10,7 @@ RUN apk add --no-cache \ ## copy frontend COPY nginx.conf /etc/nginx/nginx.conf -COPY illa-builder-frontend.conf /etc/nginx/conf.d/illa-builder-frontend.conf COPY ./apps/builder/dist /opt/illa/illa-builder-frontend -RUN rm /etc/nginx/conf.d/default.conf # test nginx RUN nginx -t diff --git a/illa-builder-frontend.conf b/illa-builder-frontend.conf deleted file mode 100644 index d7bee9c9e..000000000 --- a/illa-builder-frontend.conf +++ /dev/null @@ -1,27 +0,0 @@ -server { - listen 80; - server_name localhost; - access_log /dev/stdout; - error_log /dev/stderr; - root /opt/illa/illa-builder-frontend/; - index index.html; - gzip on; - - proxy_ssl_server_name on; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-Host $host; - proxy_set_header Accept-Encoding ""; - - sub_filter_once off; - location / { - try_files $uri $uri/ /index.html; - expires -1; - } - - location /assets { - expires 1y; - } -} - diff --git a/nginx.conf b/nginx.conf index 98a97a4d4..3032fea1a 100644 --- a/nginx.conf +++ b/nginx.conf @@ -34,5 +34,23 @@ http { keepalive_timeout 65; - include /etc/nginx/conf.d/*.conf; + server { + listen 80; + server_name localhost; + access_log /dev/stdout; + error_log /dev/stderr; + root /opt/illa/illa-builder-frontend/; + index index.html; + gzip on; + + sub_filter_once off; + location / { + try_files $uri $uri/ /index.html; + expires -1; + } + + location /assets { + expires 1y; + } + } }