From eb0cb63e22fcdb4159595574d301871ee5adf245 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 12 Aug 2022 13:38:50 -0400 Subject: [PATCH 1/2] switch to hybrid --- README.md | 2 +- .../dependencies.d/init-mods | 0 .../init-mod-healthchecks-apprise-add-package/run | 12 ++++++++++++ .../init-mod-healthchecks-apprise-add-package/type | 1 + .../init-mod-healthchecks-apprise-add-package/up | 1 + .../init-mod-healthchecks-apprise-add-package | 0 .../init-mod-healthchecks-apprise-add-package | 0 7 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-healthchecks-apprise-add-package/dependencies.d/init-mods create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-healthchecks-apprise-add-package/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-healthchecks-apprise-add-package/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-healthchecks-apprise-add-package/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-healthchecks-apprise-add-package create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-healthchecks-apprise-add-package diff --git a/README.md b/README.md index c7d7166..17070cb 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ services: - SUPERUSER_EMAIL=SUPERUSER_EMAIL - SUPERUSER_PASSWORD=SUPERUSER_PASSWORD volumes: - - path to data on host:/config + - /path/to/data/on/host:/config ports: - 8000:8000 restart: unless-stopped diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-healthchecks-apprise-add-package/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-healthchecks-apprise-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-healthchecks-apprise-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-healthchecks-apprise-add-package/run new file mode 100755 index 0000000..0a3983b --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-healthchecks-apprise-add-package/run @@ -0,0 +1,12 @@ +#!/usr/bin/with-contenv bash + +if [ ! -f /usr/bin/apprise ]; then + echo "**** apprise not installed, adding to packages to be installed ****" + echo "apprise" >> /mod-pip-packages-to-install.list + if ! pip3 -v COMMAND &> /dev/null; then + echo "*** Pip not installed, adding to packages to be installed ****" + echo "python3 python3-pip" >> /mod-repo-packages-to-install.list + fi +else + echo "**** apprise already installed, skipping ****" +fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-healthchecks-apprise-add-package/type b/root/etc/s6-overlay/s6-rc.d/init-mod-healthchecks-apprise-add-package/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-healthchecks-apprise-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-healthchecks-apprise-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-healthchecks-apprise-add-package/up new file mode 100644 index 0000000..9d7fd55 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-healthchecks-apprise-add-package/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-healthchecks-apprise-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-healthchecks-apprise-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-healthchecks-apprise-add-package new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-healthchecks-apprise-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-healthchecks-apprise-add-package new file mode 100644 index 0000000..e69de29 From 9de056d2718ab19c0abe889d96cd69084988fd33 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sun, 4 Sep 2022 21:30:09 -0400 Subject: [PATCH 2/2] deprecate --- .../run | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-healthchecks-apprise-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-healthchecks-apprise-add-package/run index 0a3983b..34f760f 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-healthchecks-apprise-add-package/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-healthchecks-apprise-add-package/run @@ -1,12 +1,18 @@ #!/usr/bin/with-contenv bash -if [ ! -f /usr/bin/apprise ]; then - echo "**** apprise not installed, adding to packages to be installed ****" - echo "apprise" >> /mod-pip-packages-to-install.list - if ! pip3 -v COMMAND &> /dev/null; then - echo "*** Pip not installed, adding to packages to be installed ****" - echo "python3 python3-pip" >> /mod-repo-packages-to-install.list - fi -else - echo "**** apprise already installed, skipping ****" -fi +echo ' +************************************************************************** +************************************************************************** +************************************************************************** +**** **** +**** **** +**** healthchecks-apprise mod has been deprecated **** +**** **** +**** **** +**** apprise is now included in the main image **** +**** **** +**** **** +************************************************************************** +************************************************************************** +************************************************************************** +'