diff --git a/docker/proxy/Dockerfile b/docker/proxy/Dockerfile index d2c5cc44..623b03af 100644 --- a/docker/proxy/Dockerfile +++ b/docker/proxy/Dockerfile @@ -1,17 +1,17 @@ -# modify time: 202412101506, you can modify here to trigger Docker Build action +# modify time: 202412101512, you can modify here to trigger Docker Build action # from Dockerfile: https://github.com/NginxProxyManager/nginx-proxy-manager/blob/develop/docker/Dockerfile # from image: https://hub.docker.com/r/jc21/nginx-proxy-manager FROM jc21/nginx-proxy-manager:2.11.3 LABEL maintainer="Websoft9" -LABEL version="2.11.3-rc6" +LABEL version="2.11.3" COPY README.md /data/nginx/README.md RUN mkdir /data/nginx/custom RUN mkdir -p /etc/websoft9 COPY ./config/http.conf /data/nginx/custom/http.conf -COPY ./config/initproxy.conf /data/nginx/websoft999999/initproxy.conf +COPY ./config/initproxy.conf /etc/websoft9/initproxy.conf COPY ./init_nginx.sh /app/init_nginx.sh RUN chmod +x /app/init_nginx.sh diff --git a/docker/proxy/init_nginx.sh b/docker/proxy/init_nginx.sh index 00a85ed1..598fdfde 100644 --- a/docker/proxy/init_nginx.sh +++ b/docker/proxy/init_nginx.sh @@ -4,7 +4,7 @@ credential_path="/data/credential" # Migrating initproxy.conf file - +if [ ! -d /data/nginx/default_host ]; then mkdir -p /data/nginx/default_host; fi cp -f /etc/websoft9/initproxy.conf /data/nginx/default_host/initproxy.conf [ -f /etc/websoft9/initproxy.conf ] && rm -f /data/nginx/proxy_host/initproxy.conf