From 466c11f6f6aa311f5f22811fbc4f9ebf6dd6d610 Mon Sep 17 00:00:00 2001 From: Mindfang Date: Mon, 22 Jan 2024 20:37:00 -0600 Subject: [PATCH] Restructure to user s6-overlay properly --- Dockerfile | 2 +- root/etc/s6-overlay/s6-rc.d/crond/dependencies | 1 + root/etc/s6-overlay/s6-rc.d/crond/run | 3 +++ root/etc/s6-overlay/s6-rc.d/crond/type | 1 + root/etc/s6-overlay/s6-rc.d/initialize/type | 1 + root/etc/s6-overlay/s6-rc.d/initialize/up | 1 + root/etc/s6-overlay/s6-rc.d/nginx/dependencies | 1 + root/etc/{services.d => s6-overlay/s6-rc.d}/nginx/run | 3 ++- root/etc/s6-overlay/s6-rc.d/nginx/type | 1 + root/etc/s6-overlay/s6-rc.d/php-fpm/dependencies | 1 + root/etc/{services.d => s6-overlay/s6-rc.d}/php-fpm/run | 3 ++- root/etc/s6-overlay/s6-rc.d/php-fpm/type | 1 + root/etc/s6-overlay/s6-rc.d/pteroq/dependencies | 1 + root/etc/{services.d => s6-overlay/s6-rc.d}/pteroq/run | 3 ++- root/etc/s6-overlay/s6-rc.d/pteroq/type | 1 + root/etc/s6-overlay/s6-rc.d/user/contents.d/crond | 0 root/etc/s6-overlay/s6-rc.d/user/contents.d/nginx | 0 root/etc/s6-overlay/s6-rc.d/user/contents.d/php-fpm | 0 root/etc/s6-overlay/s6-rc.d/user/contents.d/pteroq | 0 root/etc/{cont-init.d => s6-overlay/scripts}/initializer | 0 root/etc/services.d/crond/run | 2 -- 21 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/crond/dependencies create mode 100644 root/etc/s6-overlay/s6-rc.d/crond/run create mode 100644 root/etc/s6-overlay/s6-rc.d/crond/type create mode 100644 root/etc/s6-overlay/s6-rc.d/initialize/type create mode 100644 root/etc/s6-overlay/s6-rc.d/initialize/up create mode 100644 root/etc/s6-overlay/s6-rc.d/nginx/dependencies rename root/etc/{services.d => s6-overlay/s6-rc.d}/nginx/run (51%) create mode 100644 root/etc/s6-overlay/s6-rc.d/nginx/type create mode 100644 root/etc/s6-overlay/s6-rc.d/php-fpm/dependencies rename root/etc/{services.d => s6-overlay/s6-rc.d}/php-fpm/run (50%) create mode 100644 root/etc/s6-overlay/s6-rc.d/php-fpm/type create mode 100644 root/etc/s6-overlay/s6-rc.d/pteroq/dependencies rename root/etc/{services.d => s6-overlay/s6-rc.d}/pteroq/run (79%) create mode 100644 root/etc/s6-overlay/s6-rc.d/pteroq/type create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/crond create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/nginx create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/php-fpm create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/pteroq rename root/etc/{cont-init.d => s6-overlay/scripts}/initializer (100%) delete mode 100644 root/etc/services.d/crond/run diff --git a/Dockerfile b/Dockerfile index 35c508f..9ebdb3b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -80,7 +80,7 @@ ADD https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.s ADD https://bitbucket.org/Gethec/projecttools/raw/master/DockerUtilities/ContainerTools /usr/bin/ContainerTools # Install S6-Overlay and Wait-For-It -RUN chmod u+x /usr/local/bin/wait-for-it /etc/cont-init.d/initializer && \ +RUN chmod u+x /usr/local/bin/wait-for-it /etc/s6-overlay/scripts/initializer && \ tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz && \ tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz && \ # Remove preinstalled conf files diff --git a/root/etc/s6-overlay/s6-rc.d/crond/dependencies b/root/etc/s6-overlay/s6-rc.d/crond/dependencies new file mode 100644 index 0000000..d55977f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/crond/dependencies @@ -0,0 +1 @@ +initialize \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/crond/run b/root/etc/s6-overlay/s6-rc.d/crond/run new file mode 100644 index 0000000..1396db5 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/crond/run @@ -0,0 +1,3 @@ +#!/command/with-contenv bash + +/usr/sbin/crond -fL /dev/null \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/crond/type b/root/etc/s6-overlay/s6-rc.d/crond/type new file mode 100644 index 0000000..1780f9f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/crond/type @@ -0,0 +1 @@ +longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/initialize/type b/root/etc/s6-overlay/s6-rc.d/initialize/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/initialize/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/initialize/up b/root/etc/s6-overlay/s6-rc.d/initialize/up new file mode 100644 index 0000000..dbf593e --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/initialize/up @@ -0,0 +1 @@ +/etc/s6-overlay/scripts/initializer \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/nginx/dependencies b/root/etc/s6-overlay/s6-rc.d/nginx/dependencies new file mode 100644 index 0000000..d55977f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/nginx/dependencies @@ -0,0 +1 @@ +initialize \ No newline at end of file diff --git a/root/etc/services.d/nginx/run b/root/etc/s6-overlay/s6-rc.d/nginx/run similarity index 51% rename from root/etc/services.d/nginx/run rename to root/etc/s6-overlay/s6-rc.d/nginx/run index c77b8b2..34cb95c 100644 --- a/root/etc/services.d/nginx/run +++ b/root/etc/s6-overlay/s6-rc.d/nginx/run @@ -1,2 +1,3 @@ -#!/command/execlineb -P +#!/command/with-contenv bash + /usr/sbin/nginx -g "daemon off;" \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/nginx/type b/root/etc/s6-overlay/s6-rc.d/nginx/type new file mode 100644 index 0000000..1780f9f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/nginx/type @@ -0,0 +1 @@ +longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/php-fpm/dependencies b/root/etc/s6-overlay/s6-rc.d/php-fpm/dependencies new file mode 100644 index 0000000..d55977f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/php-fpm/dependencies @@ -0,0 +1 @@ +initialize \ No newline at end of file diff --git a/root/etc/services.d/php-fpm/run b/root/etc/s6-overlay/s6-rc.d/php-fpm/run similarity index 50% rename from root/etc/services.d/php-fpm/run rename to root/etc/s6-overlay/s6-rc.d/php-fpm/run index e6e7f62..81c05e8 100644 --- a/root/etc/services.d/php-fpm/run +++ b/root/etc/s6-overlay/s6-rc.d/php-fpm/run @@ -1,2 +1,3 @@ -#!/command/execlineb -P +#!/command/with-contenv bash + /usr/sbin/php-fpm -Fc /etc/php \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/php-fpm/type b/root/etc/s6-overlay/s6-rc.d/php-fpm/type new file mode 100644 index 0000000..1780f9f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/php-fpm/type @@ -0,0 +1 @@ +longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/pteroq/dependencies b/root/etc/s6-overlay/s6-rc.d/pteroq/dependencies new file mode 100644 index 0000000..d55977f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/pteroq/dependencies @@ -0,0 +1 @@ +initialize \ No newline at end of file diff --git a/root/etc/services.d/pteroq/run b/root/etc/s6-overlay/s6-rc.d/pteroq/run similarity index 79% rename from root/etc/services.d/pteroq/run rename to root/etc/s6-overlay/s6-rc.d/pteroq/run index 55193fb..86617dc 100644 --- a/root/etc/services.d/pteroq/run +++ b/root/etc/s6-overlay/s6-rc.d/pteroq/run @@ -1,3 +1,4 @@ -#!/command/execlineb -P +#!/command/with-contenv bash + s6-setuidgid nginx /usr/bin/php /var/www/pterodactyl/artisan queue:work --queue=high,standard,low --sleep=3 --tries=3 \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/pteroq/type b/root/etc/s6-overlay/s6-rc.d/pteroq/type new file mode 100644 index 0000000..1780f9f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/pteroq/type @@ -0,0 +1 @@ +longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/crond b/root/etc/s6-overlay/s6-rc.d/user/contents.d/crond new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/nginx b/root/etc/s6-overlay/s6-rc.d/user/contents.d/nginx new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/php-fpm b/root/etc/s6-overlay/s6-rc.d/user/contents.d/php-fpm new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/pteroq b/root/etc/s6-overlay/s6-rc.d/user/contents.d/pteroq new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/initializer b/root/etc/s6-overlay/scripts/initializer similarity index 100% rename from root/etc/cont-init.d/initializer rename to root/etc/s6-overlay/scripts/initializer diff --git a/root/etc/services.d/crond/run b/root/etc/services.d/crond/run deleted file mode 100644 index 500460b..0000000 --- a/root/etc/services.d/crond/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/command/execlineb -P -/usr/sbin/crond -fL /dev/null \ No newline at end of file