Merge branch 'develop' into oxcert

This commit is contained in:
Matthew Seaman 2023-10-27 09:13:01 +01:00
commit 8642c1625f
4 changed files with 6 additions and 4 deletions

View File

@ -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

View File

@ -1 +1 @@
1.0.2
1.1.0

View File

@ -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": {

1
requirements-plugins.txt Normal file
View File

@ -0,0 +1 @@
netbox-plugin-dns