Skip to content

Commit 909a9d0

Browse files
authored
Merge pull request #1628 from netbox-community/develop
Release 4.0.1
2 parents c60defe + 7ab38e6 commit 909a9d0

6 files changed

Lines changed: 26 additions & 6 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG FROM
22
FROM ${FROM} AS builder
33

4-
COPY --from=ghcr.io/astral-sh/uv:0.9 /uv /usr/local/bin/
4+
COPY --from=ghcr.io/astral-sh/uv:0.10 /uv /usr/local/bin/
55
RUN export DEBIAN_FRONTEND=noninteractive \
66
&& apt-get update -qq \
77
&& apt-get upgrade \

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.0
1+
4.0.1

configuration/configuration.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,14 @@ def _environ_get_and_map(variable_name: str, default: str | None = None, map_fn:
317317
SOCIAL_AUTH_GOOGLE_OAUTH2_KEY = environ.get('SOCIAL_AUTH_GOOGLE_OAUTH2_KEY')
318318
SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = _read_secret('google_oauth2_secret', environ.get('SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET', ''))
319319

320+
# OIDC Configuration
321+
SOCIAL_AUTH_OIDC_OIDC_ENDPOINT = environ.get('SOCIAL_AUTH_OIDC_OIDC_ENDPOINT')
322+
SOCIAL_AUTH_OIDC_KEY = environ.get('SOCIAL_AUTH_OIDC_KEY')
323+
SOCIAL_AUTH_OIDC_SECRET = _read_secret('oidc_secret', environ.get('SOCIAL_AUTH_OIDC_SECRET', ''))
324+
SOCIAL_AUTH_OIDC_SCOPE = _environ_get_and_map('SOCIAL_AUTH_OIDC_SCOPE', '', _AS_LIST)
325+
LOGOUT_REDIRECT_URL = environ.get('LOGOUT_REDIRECT_URL')
326+
SOCIAL_AUTH_OIDC_JWT_ALGORITHMS = _environ_get_and_map('SOCIAL_AUTH_OIDC_JWT_ALGORITHMS', "RS256", _AS_LIST)
327+
320328
# This repository is used to check whether there is a new release of NetBox available. Set to None to disable the
321329
# version check or use the URL below to check for release in the official NetBox repository.
322330
RELEASE_CHECK_URL = environ.get('RELEASE_CHECK_URL', None)
@@ -363,3 +371,6 @@ def _environ_get_and_map(variable_name: str, default: str | None = None, map_fn:
363371

364372
# If true disables miscellaneous functionality which depends on access to the Internet.
365373
ISOLATED_DEPLOYMENT = _environ_get_and_map('ISOLATED_DEPLOYMENT', 'False', _AS_BOOL)
374+
375+
# Enables or disables the NetBox Copilot agent globally. When enabled, users can opt to toggle the agent individually.
376+
COPILOT_ENABLED = _environ_get_and_map('COPILOT_ENABLED', 'True', _AS_BOOL)

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
netbox: &netbox
3-
image: docker.io/netboxcommunity/netbox:${VERSION-v4.5-4.0.0}
3+
image: docker.io/netboxcommunity/netbox:${VERSION-v4.5-4.0.1}
44
depends_on:
55
- postgres
66
- redis

env/netbox.env

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,12 @@ SKIP_SUPERUSER=true
4242
# SOCIAL_AUTH_GOOGLE_OAUTH2_KEY=your_google_client_id
4343
# SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET=your_google_client_secret
4444
WEBHOOKS_ENABLED=true
45+
46+
# Configuration for OIDC
47+
# REMOTE_AUTH_BACKEND='social_core.backends.open_id_connect.OpenIdConnectAuth'
48+
# SOCIAL_AUTH_OIDC_OIDC_ENDPOINT='https://example.org'
49+
# SOCIAL_AUTH_OIDC_KEY=''
50+
# SOCIAL_AUTH_OIDC_SECRET=''
51+
# SOCIAL_AUTH_OIDC_SCOPE=openid profile email roles
52+
# LOGOUT_REDIRECT_URL='https://example.org'
53+
# SOCIAL_AUTH_OIDC_JWT_ALGORITHMS=RS256

requirements-container.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
django-auth-ldap==5.3.0
2-
dulwich==1.0.0
3-
granian[uvloop]==2.7.0
2+
dulwich==1.1.0
3+
granian[uvloop]==2.7.1
44
python3-saml==1.16.0
55
--no-binary lxml
66
--no-binary xmlsec
7-
sentry-sdk[django]==2.51.0
7+
sentry-sdk[django]==2.53.0

0 commit comments

Comments
 (0)