From 67e5d4ae3d5a08e0a556058641a9509e3c41f8c4 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 19 Aug 2022 16:51:40 -0400 Subject: [PATCH] switch to hybrid --- README.md | 2 +- .../dependencies.d/init-mods | 0 .../init-mod-swag-imagemagick-add-package/run | 12 ++++++++++++ .../init-mod-swag-imagemagick-add-package/type | 1 + .../s6-rc.d/init-mod-swag-imagemagick-add-package/up | 1 + .../init-mod-swag-imagemagick-add-package | 0 .../contents.d/init-mod-swag-imagemagick-add-package | 0 7 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-swag-imagemagick-add-package/dependencies.d/init-mods create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-swag-imagemagick-add-package/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-swag-imagemagick-add-package/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-swag-imagemagick-add-package/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-swag-imagemagick-add-package create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-swag-imagemagick-add-package diff --git a/README.md b/README.md index b532938..88c38ec 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Imagemagick - Docker mod for nginx/swag -This mod adds imagemagick and the php7 imagick module to nginx/swag, to be installed/updated during container start. +This mod adds imagemagick and the php imagick module to nginx/swag, to be installed/updated during container start. In nginx/swag docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:swag-imagemagick` diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-imagemagick-add-package/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-imagemagick-add-package/dependencies.d/init-mods new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-imagemagick-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-imagemagick-add-package/run new file mode 100755 index 0000000..828f642 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-imagemagick-add-package/run @@ -0,0 +1,12 @@ +#!/usr/bin/with-contenv bash + +if ! apk info 2>&1 | grep -q "imagemagick"; then + echo "**** adding imagemagick to package install list ****" + PHPVERSION=$(readlink -f /usr/bin/php | sed 's|/usr/bin/||') + echo "\ + imagemagick \ + ${PHPVERSION}-pecl-imagick" >> /mod-repo-packages-to-install.list + if +else + echo "**** imagemagick already installed, skipping ****" +fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-imagemagick-add-package/type b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-imagemagick-add-package/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-imagemagick-add-package/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-imagemagick-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-imagemagick-add-package/up new file mode 100644 index 0000000..7cfef65 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-imagemagick-add-package/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-swag-imagemagick-add-package/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-swag-imagemagick-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-swag-imagemagick-add-package new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-swag-imagemagick-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-swag-imagemagick-add-package new file mode 100644 index 0000000..e69de29