From 05e2a8cd35bad0bd5bf51c1210fe7a51acbe2a25 Mon Sep 17 00:00:00 2001 From: Jared-Bloomer Date: Mon, 26 Aug 2024 14:41:01 -0400 Subject: [PATCH 01/11] initial commit --- .github/workflows/BuildImage.yml | 4 +-- Dockerfile | 2 +- Dockerfile.complex | 33 ------------------- README.md | 26 ++------------- .../run | 30 ----------------- .../init-mod-imagename-modname-add-package/up | 1 - .../init-mod-imagename-modname-install/run | 8 ----- .../init-mod-imagename-modname-install/type | 1 - .../dependencies.d/init-mods-package-install | 0 .../init-mod-netbox-slurpit-install/run | 23 +++++++++++++ .../type | 0 .../up | 0 .../init-mod-netbox-slurpit-install} | 0 .../init-mod-imagename-modname-add-package | 0 .../dependencies.d/init-services | 0 .../s6-rc.d/svc-mod-imagename-modname/run | 7 ---- .../s6-rc.d/svc-mod-imagename-modname/type | 1 - .../init-mod-imagename-modname-add-package | 0 .../init-mod-imagename-modname-install | 0 .../init-mod-netbox-slurpit-install} | 0 .../user/contents.d/svc-mod-imagename-modname | 0 21 files changed, 29 insertions(+), 107 deletions(-) delete mode 100644 Dockerfile.complex delete mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/run delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/up delete mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/run delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/type rename root/etc/s6-overlay/s6-rc.d/{init-mod-imagename-modname-install => init-mod-netbox-slurpit-install}/dependencies.d/init-mods-package-install (100%) create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run rename root/etc/s6-overlay/s6-rc.d/{init-mod-imagename-modname-add-package => init-mod-netbox-slurpit-install}/type (100%) rename root/etc/s6-overlay/s6-rc.d/{init-mod-imagename-modname-install => init-mod-netbox-slurpit-install}/up (100%) rename root/etc/s6-overlay/s6-rc.d/{init-mod-imagename-modname-add-package/dependencies.d/init-mods => init-mods-end/dependencies.d/init-mod-netbox-slurpit-install} (100%) delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-imagename-modname-add-package delete mode 100644 root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/dependencies.d/init-services delete mode 100755 root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/run delete mode 100644 root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/type delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-imagename-modname-add-package delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-imagename-modname-install rename root/etc/s6-overlay/s6-rc.d/{init-mods-end/dependencies.d/init-mod-imagename-modname-install => user/contents.d/init-mod-netbox-slurpit-install} (100%) delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-imagename-modname diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index 6008e850..5de9df34 100644 --- a/.github/workflows/BuildImage.yml +++ b/.github/workflows/BuildImage.yml @@ -5,8 +5,8 @@ on: [push, pull_request_target, workflow_dispatch] env: GITHUB_REPO: "linuxserver/docker-mods" #don't modify ENDPOINT: "linuxserver/mods" #don't modify - BASEIMAGE: "replace_baseimage" #replace - MODNAME: "replace_modname" #replace + BASEIMAGE: "netbox" #replace + MODNAME: "slurpit" #replace MULTI_ARCH: "true" #set to false if not needed jobs: diff --git a/Dockerfile b/Dockerfile index aa661704..a9308fa0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM scratch -LABEL maintainer="username" +LABEL maintainer="jared-bloomer" # copy local files COPY root/ / diff --git a/Dockerfile.complex b/Dockerfile.complex deleted file mode 100644 index 3ed07b0d..00000000 --- a/Dockerfile.complex +++ /dev/null @@ -1,33 +0,0 @@ -# syntax=docker/dockerfile:1 - -## Buildstage ## -FROM ghcr.io/linuxserver/baseimage-alpine:3.20 AS buildstage - -RUN \ - echo "**** install packages ****" && \ - apk add --no-cache \ - curl && \ - echo "**** grab rclone ****" && \ - mkdir -p /root-layer && \ - if [ $(uname -m) = "x86_64" ]; then \ - echo "Downloading x86_64 tarball" && \ - curl -o \ - /root-layer/rclone.deb -L \ - "https://downloads.rclone.org/v1.47.0/rclone-v1.47.0-linux-amd64.deb"; \ - elif [ $(uname -m) = "aarch64" ]; then \ - echo "Downloading aarch64 tarball" && \ - curl -o \ - /root-layer/rclone.deb -L \ - "https://downloads.rclone.org/v1.47.0/rclone-v1.47.0-linux-arm64.deb"; \ - fi && \ - -# copy local files -COPY root/ /root-layer/ - -## Single layer deployed image ## -FROM scratch - -LABEL maintainer="username" - -# Add files from buildstage -COPY --from=buildstage /root-layer/ / diff --git a/README.md b/README.md index 17006683..052be786 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,5 @@ -# Rsync - Docker mod for openssh-server +# SlurpIT - Docker mod for installing the SlurpIT plugin for netbox -This mod adds rsync to openssh-server, to be installed/updated during container start. +This mod adds the slurpit plugin to a netbox container. -In openssh-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:openssh-server-rsync` - -If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:openssh-server-rsync|linuxserver/mods:openssh-server-mod2` - -# Mod creation instructions - -* Fork the repo, create a new branch based on the branch `template`. -* Edit the `Dockerfile` for the mod. `Dockerfile.complex` is only an example and included for reference; it should be deleted when done. -* Inspect the `root` folder contents. Edit, add and remove as necessary. -* After all init scripts and services are created, run `find ./ -path "./.git" -prune -o \( -name "run" -o -name "finish" -o -name "check" \) -not -perm -u=x,g=x,o=x -print -exec chmod +x {} +` to fix permissions. -* Edit this readme with pertinent info, delete these instructions. -* Finally edit the `.github/workflows/BuildImage.yml`. Customize the vars for `BASEIMAGE` and `MODNAME`. Set the versioning logic and `MULTI_ARCH` if needed. -* Ask the team to create a new branch named `-`. Baseimage should be the name of the image the mod will be applied to. The new branch will be based on the `template` branch. -* Submit PR against the branch created by the team. - - -## Tips and tricks - -* Some images have helpers built in, these images are currently: - * [Openvscode-server](https://github.com/linuxserver/docker-openvscode-server/pull/10/files) - * [Code-server](https://github.com/linuxserver/docker-code-server/pull/95) +In netbox docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:netbox-slurpit` diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/run deleted file mode 100755 index 063b5701..00000000 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/run +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/with-contenv bash - -# This is the init file used for adding os or pip packages to install lists. -# It takes advantage of the built-in init-mods-package-install init script that comes with the baseimages. -# If using this, we need to make sure we set this init as a dependency of init-mods-package-install so this one runs first - -if ! command -v apprise; then - echo "**** Adding apprise and its deps to package install lists ****" - echo "apprise" >> /mod-pip-packages-to-install.list - ## Ubuntu - if [ -f /usr/bin/apt ]; then - echo "\ - python3 \ - python3-pip \ - runc" >> /mod-repo-packages-to-install.list - fi - # Alpine - if [ -f /sbin/apk ]; then - echo "\ - cargo \ - libffi-dev \ - openssl-dev \ - python3 \ - python3-dev \ - python3 \ - py3-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-imagename-modname-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/up deleted file mode 100644 index 6414139f..00000000 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/run b/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/run deleted file mode 100755 index 59a4b77f..00000000 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/run +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/with-contenv bash - -# This is an install script that is designed to run after init-mods-package-install -# so it can take advantage of packages installed -# init-mods-end depends on this script so that later init and services wait until this script exits - -echo "**** Setting up apprise ****" -apprise blah blah diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/type b/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/type deleted file mode 100644 index 3d92b15f..00000000 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/type +++ /dev/null @@ -1 +0,0 @@ -oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/dependencies.d/init-mods-package-install b/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/dependencies.d/init-mods-package-install similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/dependencies.d/init-mods-package-install rename to root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/dependencies.d/init-mods-package-install diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run b/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run new file mode 100755 index 00000000..60aa5178 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run @@ -0,0 +1,23 @@ +#!/usr/bin/with-contenv bash + +# This is an install script that is designed to run after init-mods-package-install +# so it can take advantage of packages installed +# init-mods-end depends on this script so that later init and services wait until this script exits + +echo "**** Installing Netbox SlurpIT plugin ****" +echo "**** see https://netboxlabs.com/netbox-plugins/ for more information ****" + +if ! command -v python3; then + echo "**** Python3 is not installed ****" + exit 1 +else: + if [ -f /lsiopy/bin/python3 ]; then + /lsiopy/bin/python3 -m pip install --no-cache-dir slurpit_netbox + echo "Please update configuration.py to include " + echo "PLUGINS = ['slurpit_netbox']" + else: + echo "/lsiopy/bin/python3 not found!" + exit 1 + fi +fi + diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/type b/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/type similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/type rename to root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/type diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/up b/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/up similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/up rename to root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/up diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-netbox-slurpit-install similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/dependencies.d/init-mods rename to root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-netbox-slurpit-install diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-imagename-modname-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-imagename-modname-add-package deleted file mode 100644 index e69de29b..00000000 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/dependencies.d/init-services deleted file mode 100644 index e69de29b..00000000 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/run b/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/run deleted file mode 100755 index 02ffe39a..00000000 --- a/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/run +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/with-contenv bash - -# This is an example service that would run for the mod -# It depends on init-services, the baseimage hook for start of all longrun services - -exec \ - s6-setuidgid abc run my app diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/type b/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/type deleted file mode 100644 index 1780f9f4..00000000 --- a/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/type +++ /dev/null @@ -1 +0,0 @@ -longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-imagename-modname-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-imagename-modname-add-package deleted file mode 100644 index e69de29b..00000000 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-imagename-modname-install b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-imagename-modname-install deleted file mode 100644 index e69de29b..00000000 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-imagename-modname-install b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-netbox-slurpit-install similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-imagename-modname-install rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-netbox-slurpit-install diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-imagename-modname b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-imagename-modname deleted file mode 100644 index e69de29b..00000000 From a5c968fe598afcca9b0153de6ef99ce53c8806ad Mon Sep 17 00:00:00 2001 From: Jared-Bloomer Date: Mon, 26 Aug 2024 16:16:18 -0400 Subject: [PATCH 02/11] activating/deactivating venv --- root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run | 2 ++ 1 file changed, 2 insertions(+) diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run b/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run index 60aa5178..de8dee2e 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run @@ -12,9 +12,11 @@ if ! command -v python3; then exit 1 else: if [ -f /lsiopy/bin/python3 ]; then + source /lsiopy/bin/activate /lsiopy/bin/python3 -m pip install --no-cache-dir slurpit_netbox echo "Please update configuration.py to include " echo "PLUGINS = ['slurpit_netbox']" + /lsiopy/bin/deactivate else: echo "/lsiopy/bin/python3 not found!" exit 1 From 7d66a1b93ed852e0366fe90e04f438677650eb4a Mon Sep 17 00:00:00 2001 From: Jared-Bloomer Date: Mon, 26 Aug 2024 16:19:06 -0400 Subject: [PATCH 03/11] setting Multi_Arch to false --- .github/workflows/BuildImage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index 5de9df34..d933b281 100644 --- a/.github/workflows/BuildImage.yml +++ b/.github/workflows/BuildImage.yml @@ -7,7 +7,7 @@ env: ENDPOINT: "linuxserver/mods" #don't modify BASEIMAGE: "netbox" #replace MODNAME: "slurpit" #replace - MULTI_ARCH: "true" #set to false if not needed + MULTI_ARCH: "false" #set to false if not needed jobs: set-vars: From cd3f5d6861c489998bee415f02dd0411f0d312f2 Mon Sep 17 00:00:00 2001 From: Jared-Bloomer Date: Mon, 26 Aug 2024 16:21:06 -0400 Subject: [PATCH 04/11] adding config options --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 052be786..f7b00779 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,13 @@ This mod adds the slurpit plugin to a netbox container. In netbox docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:netbox-slurpit` + +Update your `configuration.py` to include the plugin + +``` +... +# Enable installed plugins. Add the name of each plugin to the list. +PLUGINS = ['slurpit_netbox'] + +... +``` \ No newline at end of file From 774ab6d5ada779583891e75379eb4b2841f8d007 Mon Sep 17 00:00:00 2001 From: Jared-Bloomer Date: Mon, 26 Aug 2024 16:28:30 -0400 Subject: [PATCH 05/11] complete rewrite to confirm to standards --- .../s6-rc.d/init-mod-netbox-slurpit-install/run | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run b/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run index de8dee2e..5590d7dd 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run @@ -23,3 +23,17 @@ else: fi fi +#!/usr/bin/with-contenv bash + +if ! pip list 2> /dev/null | grep -q "slurpit_netbox"; then + echo "**** Adding slurpit_netbox and their deps to package install lists ****" + echo "\ + setuptools" >> /mod-pip-packages-to-install.list + if [ $(arch) = "x86_64" ]; then + echo "setuptools" >> /mod-pip-packages-to-install.list + fi + echo "\ + slurpit_netbox" >> /mod-pip-packages-to-install.list +else + echo "**** slurpit_netbox already installed, skipping ****" +fi From 5eb69b43803c3f5709cbbe3d104b138f771f3b42 Mon Sep 17 00:00:00 2001 From: Jared-Bloomer Date: Mon, 26 Aug 2024 16:37:06 -0400 Subject: [PATCH 06/11] removing old code. DUH! --- .../init-mod-netbox-slurpit-install/run | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run b/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run index 5590d7dd..16331856 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run @@ -1,30 +1,5 @@ #!/usr/bin/with-contenv bash -# This is an install script that is designed to run after init-mods-package-install -# so it can take advantage of packages installed -# init-mods-end depends on this script so that later init and services wait until this script exits - -echo "**** Installing Netbox SlurpIT plugin ****" -echo "**** see https://netboxlabs.com/netbox-plugins/ for more information ****" - -if ! command -v python3; then - echo "**** Python3 is not installed ****" - exit 1 -else: - if [ -f /lsiopy/bin/python3 ]; then - source /lsiopy/bin/activate - /lsiopy/bin/python3 -m pip install --no-cache-dir slurpit_netbox - echo "Please update configuration.py to include " - echo "PLUGINS = ['slurpit_netbox']" - /lsiopy/bin/deactivate - else: - echo "/lsiopy/bin/python3 not found!" - exit 1 - fi -fi - -#!/usr/bin/with-contenv bash - if ! pip list 2> /dev/null | grep -q "slurpit_netbox"; then echo "**** Adding slurpit_netbox and their deps to package install lists ****" echo "\ From 5a6141374789aef6bf9648fee335444f4c8370a8 Mon Sep 17 00:00:00 2001 From: Jared-Bloomer Date: Mon, 26 Aug 2024 16:49:44 -0400 Subject: [PATCH 07/11] updating mod path --- root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/up | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/up b/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/up index 03d298d2..f89439e1 100644 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/up +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/up @@ -1 +1 @@ -/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/run \ No newline at end of file +/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run \ No newline at end of file From 7b292dfbcbd7239cc9767730e78786edb76927ee Mon Sep 17 00:00:00 2001 From: Jared-Bloomer Date: Mon, 26 Aug 2024 16:56:20 -0400 Subject: [PATCH 08/11] refactoring --- .../s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run b/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run index 16331856..7599f275 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run @@ -3,11 +3,7 @@ if ! pip list 2> /dev/null | grep -q "slurpit_netbox"; then echo "**** Adding slurpit_netbox and their deps to package install lists ****" echo "\ - setuptools" >> /mod-pip-packages-to-install.list - if [ $(arch) = "x86_64" ]; then - echo "setuptools" >> /mod-pip-packages-to-install.list - fi - echo "\ + setuptools \ slurpit_netbox" >> /mod-pip-packages-to-install.list else echo "**** slurpit_netbox already installed, skipping ****" From 4bc6eafaca6961d92033a3dbbd318d24c5dec8f1 Mon Sep 17 00:00:00 2001 From: Jared-Bloomer Date: Mon, 26 Aug 2024 17:07:13 -0400 Subject: [PATCH 09/11] updating dependencies --- .../dependencies.d/{init-mods-package-install => init-mods} | 0 .../dependencies.d/init-mod-netbox-slurpit-install | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/dependencies.d/{init-mods-package-install => init-mods} (100%) rename root/etc/s6-overlay/s6-rc.d/{init-mods-end => init-mods-package-install}/dependencies.d/init-mod-netbox-slurpit-install (100%) diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/dependencies.d/init-mods-package-install b/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/dependencies.d/init-mods similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/dependencies.d/init-mods-package-install rename to root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/dependencies.d/init-mods diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-netbox-slurpit-install b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-netbox-slurpit-install similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-netbox-slurpit-install rename to root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-netbox-slurpit-install From 6daaba0ea3c9fe43699f35d67cef6e3a4acc874c Mon Sep 17 00:00:00 2001 From: Jared-Bloomer Date: Mon, 26 Aug 2024 19:05:59 -0400 Subject: [PATCH 10/11] Adding additional debug echo --- root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run | 1 + 1 file changed, 1 insertion(+) diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run b/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run index 7599f275..dc09bba5 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run @@ -1,5 +1,6 @@ #!/usr/bin/with-contenv bash +echo '**** Checking if slurpit_netbox is already installed ****' if ! pip list 2> /dev/null | grep -q "slurpit_netbox"; then echo "**** Adding slurpit_netbox and their deps to package install lists ****" echo "\ From 447eae346a3891f8c008f6eb005a3723311df9c8 Mon Sep 17 00:00:00 2001 From: Jared-Bloomer Date: Mon, 26 Aug 2024 19:11:08 -0400 Subject: [PATCH 11/11] updating stdout redirection --- root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run b/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run index dc09bba5..e7986a34 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-netbox-slurpit-install/run @@ -1,7 +1,7 @@ #!/usr/bin/with-contenv bash echo '**** Checking if slurpit_netbox is already installed ****' -if ! pip list 2> /dev/null | grep -q "slurpit_netbox"; then +if ! pip list 2>&1 | grep -q "slurpit_netbox"; then echo "**** Adding slurpit_netbox and their deps to package install lists ****" echo "\ setuptools \