diff --git a/docker/proxy/Dockerfile b/docker/proxy/Dockerfile index 8c6e6bdc..5f884f67 100644 --- a/docker/proxy/Dockerfile +++ b/docker/proxy/Dockerfile @@ -7,6 +7,7 @@ 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 5ec3ae9c..06d7cf69 100644 --- a/docker/proxy/s6/init_user/init_user.sh +++ b/docker/proxy/s6/init_user/init_user.sh @@ -50,4 +50,6 @@ echo "Save to credential" json="{\"username\":\"$username\",\"password\":\"$password\"}" echo "$json" > "$cred_path" -set -e \ No newline at end of file +set -e + +s6-svc -D /etc/s6-overlay/s6-rc.d/init_user \ No newline at end of file diff --git a/docker/proxy/s6/init_user/run b/docker/proxy/s6/init_user/run index c1a3a3cd..32bdce63 100644 --- a/docker/proxy/s6/init_user/run +++ b/docker/proxy/s6/init_user/run @@ -1,4 +1,3 @@ #!/bin/bash -bash /etc/s6-overlay/s6-rc.d/init_user/init_user.sh -exec s6-svc -D /etc/s6-overlay/s6-rc.d/init_user \ No newline at end of file +exec /etc/s6-overlay/s6-rc.d/init_user/init_user.sh \ No newline at end of file diff --git a/docker/proxy/s6/init_user/type b/docker/proxy/s6/init_user/type new file mode 100644 index 00000000..c6d2e3df --- /dev/null +++ b/docker/proxy/s6/init_user/type @@ -0,0 +1 @@ +onceshot \ No newline at end of file diff --git a/docker/proxy/s6/init_user/up b/docker/proxy/s6/init_user/up new file mode 100644 index 00000000..e69de29b