diff --git a/docker/proxy/Dockerfile b/docker/proxy/Dockerfile index 5cd11d54..be5ddc93 100644 --- a/docker/proxy/Dockerfile +++ b/docker/proxy/Dockerfile @@ -5,10 +5,10 @@ LABEL version="2.10.4" RUN apt-get update && apt-get install -y curl jq COPY ./config/initproxy.conf /data/nginx/proxy_host/ -#COPY ./s6/init_user /etc/s6-overlay/s6-rc.d/init_user -#RUN ls /etc/s6-overlay/s6-rc.d/init_user -#RUN touch /etc/s6-overlay/s6-rc.d/user/contents.d/init_user -#RUN chmod -R 755 /etc/s6-overlay/s6-rc.d/init_user -COPY ./s6/init_user/init_user.sh /app/init_user.sh -RUN chmod +x /app/init_user.sh -CMD ["/bin/sh", "-c", "/app/init_user.sh && tail -f /dev/null"] \ No newline at end of file +COPY ./s6/init_user /etc/s6-overlay/s6-rc.d/init_user +RUN ls /etc/s6-overlay/s6-rc.d/init_user +RUN touch /etc/s6-overlay/s6-rc.d/user/contents.d/init_user +RUN chmod -R 755 /etc/s6-overlay/s6-rc.d/init_user +# COPY ./s6/init_user/init_user.sh /app/init_user.sh +# RUN chmod +x /app/init_user.sh +# CMD ["/bin/sh", "-c", "/app/init_user.sh && tail -f /dev/null"] \ No newline at end of file diff --git a/docker/proxy/s6/init_user/init_user.sh b/docker/proxy/s6/init_user/init_user.sh index d9fa1c0a..5ec3ae9c 100644 --- a/docker/proxy/s6/init_user/init_user.sh +++ b/docker/proxy/s6/init_user/init_user.sh @@ -1,6 +1,6 @@ #!/bin/bash -echo "Start to change nginxproxymanage users" +echo "Start to change nginxproxymanage users" >> /tmp/userlog set +e username="help@websoft9.com" diff --git a/docker/proxy/s6/init_user/run b/docker/proxy/s6/init_user/run index 32bdce63..e42c5ed5 100644 --- a/docker/proxy/s6/init_user/run +++ b/docker/proxy/s6/init_user/run @@ -1,3 +1,5 @@ #!/bin/bash -exec /etc/s6-overlay/s6-rc.d/init_user/init_user.sh \ No newline at end of file +bash /etc/s6-overlay/s6-rc.d/init_user/init_user.sh + +exec s6-svc -D /etc/s6/user \ No newline at end of file