diff --git a/docker/proxy/Dockerfile b/docker/proxy/Dockerfile index 5f884f67..8c6e6bdc 100644 --- a/docker/proxy/Dockerfile +++ b/docker/proxy/Dockerfile @@ -7,7 +7,6 @@ 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/user/ RUN chmod -R 755 /etc/s6-overlay/s6-rc.d/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 06d7cf69..5ec3ae9c 100644 --- a/docker/proxy/s6/init_user/init_user.sh +++ b/docker/proxy/s6/init_user/init_user.sh @@ -50,6 +50,4 @@ echo "Save to credential" json="{\"username\":\"$username\",\"password\":\"$password\"}" echo "$json" > "$cred_path" -set -e - -s6-svc -D /etc/s6-overlay/s6-rc.d/init_user \ No newline at end of file +set -e \ No newline at end of file diff --git a/docker/proxy/s6/init_user/run b/docker/proxy/s6/init_user/run index 32bdce63..2dbcf83d 100644 --- a/docker/proxy/s6/init_user/run +++ b/docker/proxy/s6/init_user/run @@ -1,3 +1,6 @@ #!/bin/bash -exec /etc/s6-overlay/s6-rc.d/init_user/init_user.sh \ No newline at end of file +[[ -f ./init_user.sh ]] && source ./init_user.sh +pushd /root >/dev/null +exec s6-svc -D /etc/s6-overlay/s6-rc.d/init_user +popd