Skip to content

Commit

Permalink
Merge pull request netbox-community#183 from netbox-community/dev
Browse files Browse the repository at this point in the history
prepare 3.7 release
  • Loading branch information
jeffgdotorg authored Mar 27, 2024
2 parents 05be45c + 9c65bb1 commit da0fffc
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile-plugin_dev
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG NETBOX_VARIANT=v3.6
ARG NETBOX_VARIANT=v3.7

FROM netboxcommunity/netbox:${NETBOX_VARIANT}

Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:

# postgres
postgres:
image: postgres:15-alpine
image: postgres:16-alpine
env_file: env/postgres.env

# redis
Expand Down
4 changes: 2 additions & 2 deletions netbox_acls/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion netbox_acls/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.4.0"
__version__ = "1.5.0"

0 comments on commit da0fffc

Please sign in to comment.