Merge branch 'develop' into oxcert

.github/workflows/push.yml

@@ -40,7 +40,7 @@ jobs:
           VALIDATE_DOCKERFILE: false
           VALIDATE_GITLEAKS: false
           VALIDATE_JSCPD: false
-          FILTER_REGEX_EXCLUDE: (.*/)?(LICENSE|configuration/.*)
+          FILTER_REGEX_EXCLUDE: (.*/)?(LICENSE|configuration/.*|plugins-oxcert.py)
           EDITORCONFIG_FILE_NAME: .ecrc
           DOCKERFILE_HADOLINT_FILE_NAME: .hadolint.yaml
           MARKDOWN_CONFIG_FILE: .markdown-lint.yml
@@ -54,11 +54,15 @@ jobs:
       matrix:
         build_cmd:
           - ./build-latest.sh
-          #- PRERELEASE=true ./build-latest.sh
           - ./build.sh develop
         platform:
           - linux/amd64
-          - linux/arm64
+
+          # This workflow runs tests only, and doesn't push to the
+          # container repository.  Since building on arm64 under QEMU
+          # is impossibly slow, and we don't have a native arm64
+          # option right now, just run the testing on amd64.
+          #- linux/arm64
         os:
           - ubuntu-latest
       fail-fast: false

.github/workflows/release.yml

@@ -15,7 +15,6 @@ jobs:
       matrix:
         build_cmd:
           - ./build-latest.sh
-          #- PRERELEASE=true ./build-latest.sh
           - ./build.sh develop
         platform:
           - linux/amd64,linux/arm64

Dockerfile

@@ -1,5 +1,5 @@
 ARG FROM
-FROM ${FROM} as builder
+FROM ${FROM} AS builder
 
 RUN export DEBIAN_FRONTEND=noninteractive \
     && apt-get update -qq \
@@ -47,7 +47,7 @@ RUN \
 ###
 
 ARG FROM
-FROM ${FROM} as main
+FROM ${FROM} AS main
 
 RUN export DEBIAN_FRONTEND=noninteractive \
     && apt-get update -qq \
@@ -82,7 +82,7 @@ COPY --from=builder /opt/netbox/venv /opt/netbox/venv
 ARG NETBOX_PATH
 COPY ${NETBOX_PATH} /opt/netbox
 # Copy the modified 'requirements*.txt' files, to have the files actually used during installation
-COPY --from=builder /requirements.txt /requirements-container.txt /opt/netbox/
+COPY --from=builder /requirements.txt /requirements-container.txt /requirements-plugins.txt /opt/netbox/
 
 COPY docker/configuration.docker.py /opt/netbox/netbox/netbox/configuration.py
 COPY docker/ldap_config.docker.py /opt/netbox/netbox/netbox/ldap_config.py
@@ -92,6 +92,9 @@ COPY docker/launch-netbox.sh /opt/netbox/launch-netbox.sh
 COPY configuration/ /etc/netbox/config/
 COPY docker/nginx-unit.json /etc/unit/
 
+# Enabling the netbox-dns-plugin breaks unit testing.
+# COPY plugins-oxcert.py /etc/netbox/config/plugins.py
+
 WORKDIR /opt/netbox/netbox
 
 # Must set permissions for '/opt/netbox/netbox/media' directory

VERSION

@@ -1 +1 @@
-1.2.4
+1.2.5

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_dns"]
+# PLUGINS = ["netbox_bgp"]
 
 # PLUGINS_CONFIG = {
 #   "netbox_bgp": {

plugins-oxcert.py

@@ -0,0 +1,15 @@
+# Add your plugins and plugin settings here.
+# Of course uncomment this file out.
+
+# To learn how to build images with your required plugins
+# See https://github.com/netbox-community/netbox-docker/wiki/Using-Netbox-Plugins
+
+PLUGINS = [
+    "netbox_dns",
+]
+
+# PLUGINS_CONFIG = {
+#   "netbox_bgp": {
+#     ADD YOUR SETTINGS HERE
+#   }
+# }

test.sh

@@ -4,12 +4,12 @@
 #   ./test.sh latest
 #   ./test.sh v2.9.7
 #   ./test.sh develop-2.10
-#   IMAGE='netboxcommunity/netbox:latest'        ./test.sh
-#   IMAGE='netboxcommunity/netbox:v2.9.7'        ./test.sh
-#   IMAGE='netboxcommunity/netbox:develop-2.10'  ./test.sh
-#   export IMAGE='netboxcommunity/netbox:latest';       ./test.sh
-#   export IMAGE='netboxcommunity/netbox:v2.9.7';       ./test.sh
-#   export IMAGE='netboxcommunity/netbox:develop-2.10'; ./test.sh
+#   IMAGE='ghcr.io/oxcert/netbox:latest'        ./test.sh
+#   IMAGE='ghcr.io/oxcert/netbox:v2.9.7'        ./test.sh
+#   IMAGE='ghcr.io/oxcert/netbox:develop-2.10'  ./test.sh
+#   export IMAGE='ghcr.io/oxcert/netbox:latest';       ./test.sh
+#   export IMAGE='ghcr.io/oxcert/netbox:v2.9.7';       ./test.sh
+#   export IMAGE='ghcr.io/oxcert/netbox:develop-2.10'; ./test.sh
 
 # exit when a command exits with an exit code != 0
 set -e
@@ -20,9 +20,9 @@ source ./build-functions/gh-functions.sh
 # of the Docker Image that is to be used
 if [ "${1}x" != "x" ]; then
   # Use the command line argument
-  export IMAGE="netboxcommunity/netbox:${1}"
+  export IMAGE="ghcr.io/oxcert/netbox:${1}"
 else
-  export IMAGE="${IMAGE-netboxcommunity/netbox:latest}"
+  export IMAGE="${IMAGE-ghcr.io/oxcert/netbox:latest}"
 fi
 
 # Ensure that an IMAGE is defined