Merge pull request #1438 from tobiasge/prepare-netbox-43

Prepare for NetBox 4.3
This commit is contained in:
Tobias Genannt 2025-04-20 10:50:32 +02:00 committed by GitHub
commit 82d9d8ae49
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 20 additions and 11 deletions

View File

@ -9,3 +9,6 @@ indent_size = 2
[*.py]
indent_size = 4
[VERSION]
insert_final_newline = false

View File

@ -13,11 +13,13 @@ jobs:
build:
strategy:
matrix:
build_cmd:
- ./build-latest.sh
- PRERELEASE=true ./build-latest.sh
- ./build.sh feature
- ./build.sh main
build:
- { "cmd": "./build-latest.sh", "branch": "release" }
- { "cmd": "./build.sh main", "branch": "release" }
# Build pre release images from our develop branch
# This is used to test the latest changes before they are merged into the main branch
- { "cmd": "PRERELEASE=true ./build-latest.sh", "branch": "develop" }
- { "cmd": "./build.sh feature", "branch": "develop" }
platform:
- linux/amd64,linux/arm64
fail-fast: false
@ -31,15 +33,17 @@ jobs:
- id: source-checkout
name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ matrix.build.branch }}
- id: set-netbox-docker-version
name: Get Version of NetBox Docker
run: echo "version=$(cat VERSION)" >>"$GITHUB_OUTPUT"
shell: bash
- id: check-build-needed
name: Check if the build is needed for '${{ matrix.build_cmd }}'
name: Check if the build is needed for '${{ matrix.build.cmd }}'
env:
CHECK_ONLY: "true"
run: ${{ matrix.build_cmd }}
run: ${{ matrix.build.cmd }}
# docker.io
- id: docker-io-login
name: Login to docker.io
@ -77,7 +81,7 @@ jobs:
if: steps.check-build-needed.outputs.skipped != 'true'
- id: build-and-push
name: Push the image
run: ${{ matrix.build_cmd }} --push
run: ${{ matrix.build.cmd }} --push
if: steps.check-build-needed.outputs.skipped != 'true'
env:
BUILDX_PLATFORM: ${{ matrix.platform }}

View File

@ -33,6 +33,8 @@ RUN \
# we have potential version conflicts and the build will fail.
# That's why we just replace it in the original requirements.txt.
sed -i -e 's/social-auth-core/social-auth-core\[all\]/g' /requirements.txt && \
# The same is true for 'django-storages'
sed -i -e 's/django-storages/django-storages\[azure,boto3,dropbox,google,libcloud,sftp\]/g' /requirements.txt && \
/usr/local/bin/uv pip install \
-r /requirements.txt \
-r /requirements-container.txt

View File

@ -1 +1 @@
3.2.0
3.3.0

View File

@ -1,6 +1,6 @@
services:
netbox: &netbox
image: docker.io/netboxcommunity/netbox:${VERSION-v4.2-3.2.0}
image: docker.io/netboxcommunity/netbox:${VERSION-v4.3-3.3.0}
depends_on:
- postgres
- redis

View File

@ -1,5 +1,4 @@
django-auth-ldap==5.1.0
django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.14.6
dulwich==0.22.8
python3-saml==1.16.0
--no-binary lxml

View File

@ -7,5 +7,6 @@ PLUGINS = [
'netbox.tests.dummy_plugin',
]
ALLOW_TOKEN_RETRIEVAL = True
DEFAULT_PERMISSIONS = {}