Merge branch 'master' into release
This commit is contained in:
commit
0985a0c0e1
@ -1,10 +1,10 @@
|
|||||||
FROM nginx:alpine
|
FROM nginx:alpine
|
||||||
LABEL maintainer="Jay <admin@trj.tw>"
|
LABEL maintainer="Jay <admin@trj.tw>"
|
||||||
ARG PREFIX
|
# ARG PREFIX
|
||||||
RUN mkdir -p /data
|
RUN mkdir -p /data
|
||||||
WORKDIR /data
|
WORKDIR /data
|
||||||
COPY dist/ /data
|
COPY dist/ /data
|
||||||
COPY nginx.conf /etc/nginx/conf.d/default.conf
|
COPY nginx.conf /etc/nginx/conf.d/default.conf
|
||||||
RUN sed -i 's@\$\$prefix\$\$@'${PREFIX}'@' /etc/nginx/conf.d/default.conf
|
# RUN sed -i 's@\$\$prefix\$\$@'${PREFIX}'@' /etc/nginx/conf.d/default.conf
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
CMD ["nginx", "-g", "daemon off;"]
|
CMD ["nginx", "-g", "daemon off;"]
|
@ -4,15 +4,12 @@ server {
|
|||||||
|
|
||||||
#charset koi8-r;
|
#charset koi8-r;
|
||||||
#access_log /var/log/nginx/host.access.log main;
|
#access_log /var/log/nginx/host.access.log main;
|
||||||
|
port_in_redirect off;
|
||||||
root /data;
|
root /data;
|
||||||
index index.html;
|
index index.html;
|
||||||
|
|
||||||
location / {
|
location /web {
|
||||||
|
alias /data/;
|
||||||
try_files $uri $uri/ /index.html;
|
try_files $uri $uri/ /index.html;
|
||||||
}
|
}
|
||||||
|
|
||||||
location ^~ $$prefix$$/ {
|
|
||||||
alias /data/;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
baseUrl: process.env.BASE_URL || '/'
|
baseUrl: process.env.BASE_URL || '/'
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user