update nginx
This commit is contained in:
parent
07536c5944
commit
7450fc9489
|
@ -1,17 +1,17 @@
|
|||
FROM alpine AS builder
|
||||
FROM alpine:3.15 AS builder
|
||||
|
||||
RUN apk add --update \
|
||||
--no-cache \
|
||||
pcre \
|
||||
libxml2 \
|
||||
libxslt \
|
||||
gcc \
|
||||
make \
|
||||
libc-dev \
|
||||
pcre-dev \
|
||||
zlib-dev \
|
||||
libxml2-dev \
|
||||
libxslt-dev && \
|
||||
pcre~=8.45 \
|
||||
libxml2~=2.9 \
|
||||
libxslt~=1.1 \
|
||||
gcc~=10.3 \
|
||||
make~=4.3 \
|
||||
libc-dev~=0.7 \
|
||||
pcre-dev~=8.45 \
|
||||
zlib-dev~=1.2 \
|
||||
libxml2-dev~=2.9 \
|
||||
libxslt-dev~=1.1 && \
|
||||
cd /tmp && \
|
||||
wget https://github.com/nginx/nginx/archive/master.zip -O nginx.zip && \
|
||||
unzip nginx.zip && \
|
||||
|
@ -24,18 +24,18 @@ RUN apk add --update \
|
|||
apk del gcc make libc-dev pcre-dev zlib-dev libxml2-dev libxslt-dev && \
|
||||
rm -rf /var/cache/apk
|
||||
|
||||
FROM alpine:latest
|
||||
FROM alpine:3.15
|
||||
|
||||
ARG UID=${UID:-1000}
|
||||
ARG GID=${GID:-1000}
|
||||
|
||||
RUN apk add --update \
|
||||
--no-cache \
|
||||
pcre \
|
||||
libxml2 \
|
||||
libxslt \
|
||||
tini \
|
||||
shadow &&\
|
||||
pcre~=8.45 \
|
||||
libxml2~=2.9 \
|
||||
libxslt~=1.1 \
|
||||
tini~=0.19 \
|
||||
shadow~=4.8 &&\
|
||||
rm -rf /var/cache/apk && \
|
||||
groupmod -g $GID www-data && \
|
||||
adduser -u $UID -S www-data -G www-data && \
|
||||
|
|
|
@ -5,15 +5,15 @@ services:
|
|||
- proxy
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.http.services.nginx.loadbalancer.server.port=8080
|
||||
- traefik.http.routers.nginx.entrypoints=web
|
||||
- traefik.http.routers.nginx.rule=Host(`${FQDN}`)
|
||||
- traefik.http.middlewares.nginx-https-redirect.redirectscheme.scheme=https
|
||||
- traefik.http.routers.nginx.middlewares=nginx-https-redirect
|
||||
- traefik.http.routers.nginx-secure.entrypoints=websecure
|
||||
- traefik.http.routers.nginx-secure.rule=Host(`${FQDN}`)
|
||||
- traefik.http.routers.nginx-secure.tls=true
|
||||
- traefik.http.routers.nginx-secure.tls.certresolver=letsencrypt
|
||||
- traefik.http.services.webdav.loadbalancer.server.port=8080
|
||||
- traefik.http.routers.webdav.entrypoints=web
|
||||
- traefik.http.routers.webdav.rule=Host(`${FQDN}`)
|
||||
- traefik.http.middlewares.webdav-https-redirect.redirectscheme.scheme=https
|
||||
- traefik.http.routers.webdav.middlewares=webdav-https-redirect
|
||||
- traefik.http.routers.webdav-secure.entrypoints=websecure
|
||||
- traefik.http.routers.webdav-secure.rule=Host(`${FQDN}`)
|
||||
- traefik.http.routers.webdav-secure.tls=true
|
||||
- traefik.http.routers.webdav-secure.tls.certresolver=letsencrypt
|
||||
|
||||
networks:
|
||||
proxy:
|
||||
|
|
Loading…
Reference in New Issue