version bump and compatible with sapper

This commit is contained in:
cupcakearmy 2020-03-21 21:24:24 +01:00
parent 1546b385a8
commit 988fb8b8a2
No known key found for this signature in database
GPG Key ID: D28129AE5654D9D9
2 changed files with 6 additions and 13 deletions

View File

@ -2,7 +2,7 @@ FROM alpine AS builder
ARG DEP_DEV="alpine-sdk zlib-dev pcre-dev openssl-dev gd-dev" ARG DEP_DEV="alpine-sdk zlib-dev pcre-dev openssl-dev gd-dev"
ARG NGINX_MODULES="--with-http_realip_module --with-threads --with-http_ssl_module --with-http_v2_module --with-http_image_filter_module --with-http_gzip_static_module --with-http_secure_link_module" ARG NGINX_MODULES="--with-http_realip_module --with-threads --with-http_ssl_module --with-http_v2_module --with-http_image_filter_module --with-http_gzip_static_module --with-http_secure_link_module"
ARG NGINX=1.16.1 ARG NGINX=1.17.9
RUN apk add --no-cache ${DEP_DEV} RUN apk add --no-cache ${DEP_DEV}
@ -29,7 +29,6 @@ RUN apk add --no-cache ${DEP_RUN} \
COPY ./conf/nginx.conf /usr/local/nginx/conf/nginx.conf COPY ./conf/nginx.conf /usr/local/nginx/conf/nginx.conf
COPY ./conf/default.conf /usr/local/nginx/conf/sites/default.conf COPY ./conf/default.conf /usr/local/nginx/conf/sites/default.conf
COPY ./html/error.html /usr/local/nginx/html/error.html
EXPOSE 80 EXPOSE 80

View File

@ -2,16 +2,10 @@ server {
listen 80; listen 80;
server_name _; server_name _;
location / { location / {
root /srv; root /srv;
try_files $uri /index.html =404; index index.html;
} try_files $uri $uri/ /index.html?$args;
}
error_page 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 420 422 423 424 426 428 429 431 444 449 450 451 /error.html;
error_page 500 501 502 503 504 505 506 507 508 509 510 511 /error.html;
location = /error.html {
internal;
root /usr/local/nginx/html;
}
} }