Switch to new version of docker-env-secrets

Author: xZero707

Dockerfile

@@ -54,9 +54,8 @@ RUN set -eux \
     && apk add --update --no-cache bash rsync \
     && /tmp/setup-unit.sh
 
-# Download init-docker-secrets service script from gist
-ADD --chmod=0777 ["https://gist.githubusercontent.com/xZero707/bd8dd4795b8266d9639ed0cdd9d81f82/raw/13d3134880a2ce16c00b9b33450c05c34d0e0619/run.sh", "/rootfs-build/etc/s6-overlay/s6-rc.d/init-docker-secrets/run"]
-
+# Install init-docker-secrets service
+COPY --from=ghcr.io/n0rthernl1ghts/docker-env-secrets:latest ["/", "/rootfs-build/"]
 
 
 ################################################

rootfs/etc/s6-overlay/s6-rc.d/init-docker-secrets/run

@@ -11,11 +11,11 @@ main() {
     # This is for legacy support for versions prior to 1.30.0
     if [ -d "/opt/unit" ] && [ -x "/opt/unit/sbin/unitd" ]; then
         echo "Legacy Unit installation detected, starting Unit from /opt/unit"
-        s6-envdir /run/secrets_normalized /opt/unit/sbin/unitd --no-daemon --tmp "/tmp" --state "/var/lib/unit/state" --modules "/opt/unit/modules" --control "unix:${unitSocket}"
+        exec /opt/unit/sbin/unitd --no-daemon --tmp "/tmp" --state "/var/lib/unit/state" --modules "/opt/unit/modules" --control "unix:${unitSocket}"
         return
     fi
 
-    s6-envdir /run/secrets_normalized /usr/local/sbin/unitd --no-daemon --control "unix:${unitSocket}"
+    exec /usr/local/sbin/unitd --no-daemon --control "unix:${unitSocket}"
 }
 
 main