diff --git a/.devcontainer/Dockerfile-plugin_dev b/.devcontainer/Dockerfile-plugin_dev index fa0ba06..02b8620 100644 --- a/.devcontainer/Dockerfile-plugin_dev +++ b/.devcontainer/Dockerfile-plugin_dev @@ -1,8 +1,8 @@ -ARG NETBOX_VARIANT=v3.6 +ARG NETBOX_VARIANT=v3.7 FROM netboxcommunity/netbox:${NETBOX_VARIANT} -ARG NETBOX_INITIALIZERS_VARIANT=3.6.* +ARG NETBOX_INITIALIZERS_VARIANT=3.7.* ARG DEBIAN_FRONTEND=noninteractive diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index cfd8f32..2307ecf 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -49,7 +49,7 @@ services: # postgres postgres: - image: postgres:15-alpine + image: postgres:16-alpine env_file: env/postgres.env volumes: - netbox-postgres-data:/var/lib/postgresql/data diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index abed693..241716d 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -23,14 +23,14 @@ body: attributes: label: NetBox access-list plugin version description: What version of the NetBox access-list plugin are you currently running? - placeholder: v1.4.0 + placeholder: v1.5.0 validations: required: true - type: input attributes: label: NetBox version description: What version of NetBox are you currently running? - placeholder: v3.6.3 + placeholder: v3.7.4 validations: required: true - type: textarea diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cacec27..fd1d7c9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -97,5 +97,12 @@ Development with this plugin leverges: * NetBox-Docker * Docker-Compose * Makefile for spin up of testing NetBox setup +* Dependabot for dependency version management + +### Cutting Releases + +1. Merge PR (squash) into `dev` branch +2. Merge `dev` into `release` branch +3. Create a release (pypi auto publishes) More Documentation to come. diff --git a/Dockerfile b/Dockerfile index 0c1b348..43a2c3e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG NETBOX_VARIANT=v3.6 +ARG NETBOX_VARIANT=v3.7 FROM netboxcommunity/netbox:${NETBOX_VARIANT} diff --git a/README.md b/README.md index 4a89d62..8a72b6b 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ This plugin provides the following models: - Access Lists - Access List to Interface Assignment -- Access List Rules (abstract model bassis for other rules) +- Access List Rules (abstract model basis for other rules) - Access List Standard Rules - Access List Extended Rules @@ -38,6 +38,7 @@ Each Plugin Version listed below has been tested with its corresponding NetBox V | NetBox Version | Plugin Version | |:--------------:|:--------------:| +| 3.7 | 1.5.0 | | 3.6 | 1.4.0 | | 3.5 | 1.3.0 | | 3.4 | 1.2.2 | diff --git a/docker-compose.yml b/docker-compose.yml index 2edb7b0..5ea2ed2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,7 +15,7 @@ services: # postgres postgres: - image: postgres:15-alpine + image: postgres:16-alpine env_file: env/postgres.env # redis diff --git a/netbox_acls/__init__.py b/netbox_acls/__init__.py index f82263a..584592f 100644 --- a/netbox_acls/__init__.py +++ b/netbox_acls/__init__.py @@ -17,8 +17,8 @@ class NetBoxACLsConfig(PluginConfig): version = __version__ description = "Manage simple ACLs in NetBox" base_url = "access-lists" - min_version = "3.6.0" - max_version = "3.6.99" + min_version = "3.7.0" + max_version = "3.7.99" config = NetBoxACLsConfig diff --git a/netbox_acls/version.py b/netbox_acls/version.py index 3e8d9f9..c179ed2 100644 --- a/netbox_acls/version.py +++ b/netbox_acls/version.py @@ -1 +1 @@ -__version__ = "1.4.0" +__version__ = "1.5.0" \ No newline at end of file