From 581acc0ae4ce96680348ccf54579b7d30c600c4b Mon Sep 17 00:00:00 2001 From: Matthew Seaman Date: Fri, 27 Oct 2023 09:05:35 +0100 Subject: [PATCH 1/2] Add dns plugin (#4) * Another requirements file for pip to process * Install the plugins requirements alongside the other python modules * Build the netbox-plugin-dns plugin into our container images --- Dockerfile | 5 +++-- configuration/plugins.py | 2 +- requirements-plugins.txt | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 requirements-plugins.txt diff --git a/Dockerfile b/Dockerfile index 558f764..6e73b4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ wheel ARG NETBOX_PATH -COPY ${NETBOX_PATH}/requirements.txt requirements-container.txt / +COPY ${NETBOX_PATH}/requirements.txt requirements-container.txt requirements-plugins.txt / RUN \ # We compile 'psycopg' in the build process sed -i -e '/psycopg/d' /requirements.txt && \ @@ -41,7 +41,8 @@ RUN \ sed -i -e 's/social-auth-core\[openidconnect\]/social-auth-core\[all\]/g' /requirements.txt && \ /opt/netbox/venv/bin/pip install \ -r /requirements.txt \ - -r /requirements-container.txt + -r /requirements-container.txt \ + -r /requirements-plugins.txt ### # Main stage diff --git a/configuration/plugins.py b/configuration/plugins.py index c0b1a1f..9b77291 100644 --- a/configuration/plugins.py +++ b/configuration/plugins.py @@ -4,7 +4,7 @@ # To learn how to build images with your required plugins # See https://github.com/netbox-community/netbox-docker/wiki/Using-Netbox-Plugins -# PLUGINS = ["netbox_bgp"] +PLUGINS = ["netbox_dns"] # PLUGINS_CONFIG = { # "netbox_bgp": { diff --git a/requirements-plugins.txt b/requirements-plugins.txt new file mode 100644 index 0000000..7b41b12 --- /dev/null +++ b/requirements-plugins.txt @@ -0,0 +1 @@ +netbox-plugin-dns From 8d5052b0ec597a8eaea8f670bfb2c29b798cd7b9 Mon Sep 17 00:00:00 2001 From: Matthew Seaman Date: Fri, 27 Oct 2023 09:11:49 +0100 Subject: [PATCH 2/2] Tag as version 1.1.0 -- added netbox-plugin-dns --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6d7de6e..9084fa2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.2 +1.1.0