清理二进制文件,修复 Dockerfile conf.d 残留问题
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,8 +1,10 @@
|
|||||||
# Docker images
|
# Docker images
|
||||||
docker-images/*.tar
|
docker-images/*.tar
|
||||||
|
nginx/*.tar
|
||||||
|
|
||||||
# frp binary (large file)
|
# frp binary (large file)
|
||||||
frpc-client/frp_*.tar.gz
|
frpc-client/frp_*.tar.gz
|
||||||
|
frpc-client/frp.tar.gz.b64
|
||||||
|
|
||||||
# IDE
|
# IDE
|
||||||
.idea/
|
.idea/
|
||||||
|
|||||||
265663
frpc-client/frp.tar.gz.b64
265663
frpc-client/frp.tar.gz.b64
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@@ -6,8 +6,10 @@ LABEL maintainer="awei"
|
|||||||
LABEL description="HTTP server with SSL support"
|
LABEL description="HTTP server with SSL support"
|
||||||
|
|
||||||
# 复制配置文件
|
# 复制配置文件
|
||||||
|
# 先清理基础镜像中可能残留的旧配置,再写入新配置
|
||||||
# conf.d 只放不依赖证书的常驻配置(80 端口:ACME 验证 + HTTPS 跳转)
|
# conf.d 只放不依赖证书的常驻配置(80 端口:ACME 验证 + HTTPS 跳转)
|
||||||
COPY nginx.conf /etc/nginx/nginx.conf
|
COPY nginx.conf /etc/nginx/nginx.conf
|
||||||
|
RUN rm -rf /etc/nginx/conf.d/*
|
||||||
COPY conf.d /etc/nginx/conf.d
|
COPY conf.d /etc/nginx/conf.d
|
||||||
COPY verification.html /usr/share/nginx/html/verification.html
|
COPY verification.html /usr/share/nginx/html/verification.html
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user