Skip to content
Snippets Groups Projects
Commit aee388cd authored by Remi  PLANEL's avatar Remi PLANEL
Browse files

root /etc/nginx/html

parent 1aa941d4
No related branches found
No related tags found
1 merge request!7K8s deploy
Pipeline #111453 canceled with stages
in 1 minute and 6 seconds
...@@ -49,5 +49,5 @@ RUN npm run generate ...@@ -49,5 +49,5 @@ RUN npm run generate
FROM nginxinc/nginx-unprivileged:1.25 FROM nginxinc/nginx-unprivileged:1.25
# RUN rm -rf /usr/share/nginx/html/* # RUN rm -rf /usr/share/nginx/html/*
COPY nginx.conf /etc/nginx/conf.d/default.conf COPY nginx.conf /etc/nginx/conf.d/default.conf
COPY --from=generate /usr/src/app/.output/public /usr/share/nginx/html COPY --from=generate /usr/src/app/.output/public /etc/nginx/html
CMD ["nginx", "-g", "daemon off;"] CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
...@@ -2,21 +2,14 @@ server_tokens off; ...@@ -2,21 +2,14 @@ server_tokens off;
server { server {
listen 8080; listen 8080;
server_name localhost; server_name localhost;
location ^~/wiki { location ^~/wiki/ {
root /usr/share/nginx/html; alias /etc/nginx/html/;
index index.html index.htm; index index.html index.htm;
try_files $uri /index.html;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-NginX-Proxy true;
# rewrite ^/wiki/(.*)$ /$1 break;
proxy_pass http://wiki/;
}
# error_page 500 502 503 504 /50x.html; }
# location = /50x.html { error_page 500 502 503 504 /50x.html;
# root /usr/share/nginx/html; location = /50x.html {
# } alias /etc/nginx/html/;
}
} }
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment