diff --git a/docker/proxy/Dockerfile b/docker/proxy/Dockerfile index 56a38d3d..da1bdb3c 100644 --- a/docker/proxy/Dockerfile +++ b/docker/proxy/Dockerfile @@ -3,10 +3,8 @@ FROM jc21/nginx-proxy-manager:2.10.4 LABEL maintainer="Websoft9" LABEL version="2.10.4" -RUN apt-get update && apt-get install -y curl supervisor jq -COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf -COPY config/user.sh /user.sh -COPY config/entrypoint.sh /entrypoint.sh +RUN apt-get update && apt-get install -y curl jq COPY ./config/initproxy.conf /data/nginx/proxy_host/ -RUN chmod +x /user.sh /entrypoint.sh +COPY ./s6/user /etc/s6-overlay/s6-rc.d/user +RUN chmod -R 755 /etc/s6-overlay/s6-rc.d/user ENTRYPOINT ["/init"] \ No newline at end of file diff --git a/docker/proxy/config/entrypoint.sh b/docker/proxy/config/entrypoint.sh deleted file mode 100644 index b493b9f5..00000000 --- a/docker/proxy/config/entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -# start by supervisord -/usr/bin/supervisord -supervisorctl start all -# change user and password -bash /user.sh -tail -f /dev/null \ No newline at end of file diff --git a/docker/proxy/config/supervisord.conf b/docker/proxy/config/supervisord.conf deleted file mode 100644 index 0337920c..00000000 --- a/docker/proxy/config/supervisord.conf +++ /dev/null @@ -1,7 +0,0 @@ -[supervisord] -nodaemon=false - -[program:nginxproxymanage] -command=/init -autostart=true -directory=/ \ No newline at end of file diff --git a/docker/proxy/s6/user/run b/docker/proxy/s6/user/run new file mode 100644 index 00000000..8a568558 --- /dev/null +++ b/docker/proxy/s6/user/run @@ -0,0 +1,6 @@ +#!/bin/bash + +[[ -f ./setup ]] && source ./setup +pushd /root >/dev/null +exec su-exec root /bin/echo "" +popd \ No newline at end of file diff --git a/docker/proxy/config/user.sh b/docker/proxy/s6/user/setup similarity index 100% rename from docker/proxy/config/user.sh rename to docker/proxy/s6/user/setup