diff --git a/docker/proxy/Dockerfile b/docker/proxy/Dockerfile index 317b04b4..537054a0 100644 --- a/docker/proxy/Dockerfile +++ b/docker/proxy/Dockerfile @@ -6,7 +6,5 @@ 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/user /etc/s6-overlay/s6-rc.d/user - -COPY init /init -RUN chmod -R 755 /etc/s6-overlay/s6-rc.d/user /init -ENTRYPOINT ["/init"] \ No newline at end of file +RUN chmod -R 755 /etc/s6-overlay/s6-rc.d/user +CMD ["/etc/s6-overlay/s6-rc.d/user/setup"] \ No newline at end of file diff --git a/docker/proxy/init b/docker/proxy/init deleted file mode 100644 index 32fb3a35..00000000 --- a/docker/proxy/init +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -e - -# This is the first program launched at container start. -# We don't know where our binaries are and we cannot guarantee -# that the default PATH can access them. -# So this script needs to be entirely self-contained until it has -# at least /command, /usr/bin and /bin in its PATH. - -addpath () { - x="$1" - IFS=: - set -- $PATH - IFS= - while test "$#" -gt 0 ; do - if test "$1" = "$x" ; then - return - fi - shift - done - PATH="${x}:$PATH" -} - -if test -z "$PATH" ; then - PATH=/bin -fi - -addpath /bin -addpath /usr/bin -addpath /command -export PATH - -# Now we're good: s6-overlay-suexec is accessible via PATH, as are -# all our binaries. -# Run preinit as root, then run stage0 as the container's user (can be -# root, can be a normal user). - -exec s6-overlay-suexec \ - ' /package/admin/s6-overlay-3.1.5.0/libexec/preinit' \ - '' \ - /package/admin/s6-overlay-3.1.5.0/libexec/stage0 \ - '' \ - /etc/s6-overlay/s6-rc.d/user/setup \ - "$@" \ No newline at end of file