From 9038fa5584ceb14257d1147e2729e786e726ae06 Mon Sep 17 00:00:00 2001 From: niiwiicamo Date: Thu, 24 Oct 2024 09:50:28 +0200 Subject: [PATCH] revert s6 init changes, just copy the auth hook into volume --- Dockerfile | 4 ++-- data/etc/s6-overlay/s6-rc.d/makeExecutable/type | 1 - data/etc/s6-overlay/s6-rc.d/makeExecutable/up | 2 -- data/etc/s6-overlay/s6-rc.d/user/contents.d/makeExecutable | 0 4 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 data/etc/s6-overlay/s6-rc.d/makeExecutable/type delete mode 100644 data/etc/s6-overlay/s6-rc.d/makeExecutable/up delete mode 100644 data/etc/s6-overlay/s6-rc.d/user/contents.d/makeExecutable diff --git a/Dockerfile b/Dockerfile index 0c8be36..e660a3d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM serversideup/php:8.3-fpm-nginx-alpine USER root -RUN mkdir -p /make-executable -COPY --chown=root:root data/etc/ /etc +VOLUME [ "/hooks" ] +COPY --chown=root:root ./auth-hook.sh /hooks/auth-hook.sh RUN mkdir -p /var/www/html/public/src &&\ install-php-extensions soap USER www-data diff --git a/data/etc/s6-overlay/s6-rc.d/makeExecutable/type b/data/etc/s6-overlay/s6-rc.d/makeExecutable/type deleted file mode 100644 index 3d92b15..0000000 --- a/data/etc/s6-overlay/s6-rc.d/makeExecutable/type +++ /dev/null @@ -1 +0,0 @@ -oneshot \ No newline at end of file diff --git a/data/etc/s6-overlay/s6-rc.d/makeExecutable/up b/data/etc/s6-overlay/s6-rc.d/makeExecutable/up deleted file mode 100644 index 8146b03..0000000 --- a/data/etc/s6-overlay/s6-rc.d/makeExecutable/up +++ /dev/null @@ -1,2 +0,0 @@ -foreground { echo "making everything in /make-executable executable..." } -chmod +x /make-executable/* 2>/dev/null diff --git a/data/etc/s6-overlay/s6-rc.d/user/contents.d/makeExecutable b/data/etc/s6-overlay/s6-rc.d/user/contents.d/makeExecutable deleted file mode 100644 index e69de29..0000000