Merge 39d2b726af into f07c9d533d

Merge pull request #1531 from netbox-community/renovate/ghcr.io-astral-sh-uv-0.x
Update ghcr.io/astral-sh/uv Docker tag to v0.9
2025-12-10 05:42:36 +00:00 · 2025-10-09 11:42:53 +01:00 · 2025-10-08 07:29:21 +02:00 · 2025-10-08 05:08:30 +00:00 · 2025-10-06 15:59:15 +02:00 · 2025-10-06 13:37:57 +00:00
5 changed files with 29 additions and 2 deletions
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 ARG FROM
 FROM ${FROM} AS builder

-COPY --from=ghcr.io/astral-sh/uv:0.8 /uv /usr/local/bin/
+COPY --from=ghcr.io/astral-sh/uv:0.9 /uv /usr/local/bin/
 RUN export DEBIAN_FRONTEND=noninteractive \
    && apt-get update -qq \
    && apt-get upgrade \
--- a/configuration/configuration.py
+++ b/configuration/configuration.py
@ -305,6 +305,12 @@ REMOTE_AUTH_SUPERUSER_GROUPS = _environ_get_and_map('REMOTE_AUTH_SUPERUSER_GROUP
 REMOTE_AUTH_SUPERUSERS = _environ_get_and_map('REMOTE_AUTH_SUPERUSERS', '', _AS_LIST)
 REMOTE_AUTH_STAFF_GROUPS = _environ_get_and_map('REMOTE_AUTH_STAFF_GROUPS', '', _AS_LIST)
 REMOTE_AUTH_STAFF_USERS = _environ_get_and_map('REMOTE_AUTH_STAFF_USERS', '', _AS_LIST)
+# SSO Configuration
+SOCIAL_AUTH_OKTA_OPENIDCONNECT_KEY = environ.get('SOCIAL_AUTH_OKTA_OPENIDCONNECT_KEY')
+SOCIAL_AUTH_OKTA_OPENIDCONNECT_SECRET = _read_secret('okta_openidconnect_secret', environ.get('SOCIAL_AUTH_OKTA_OPENIDCONNECT_SECRET', ''))
+SOCIAL_AUTH_OKTA_OPENIDCONNECT_API_URL = environ.get('SOCIAL_AUTH_OKTA_OPENIDCONNECT_API_URL')
+SOCIAL_AUTH_GOOGLE_OAUTH2_KEY = environ.get('SOCIAL_AUTH_GOOGLE_OAUTH2_KEY')
+SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = _read_secret('google_oauth2_secret', environ.get('SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET', ''))

 # This repository is used to check whether there is a new release of NetBox available. Set to None to disable the
 # version check or use the URL below to check for release in the official NetBox repository.
--- a/docker-compose.override.yml.example
+++ b/docker-compose.override.yml.example
@ -19,4 +19,17 @@ services:
      # SUPERUSER_EMAIL: ""
      # SUPERUSER_NAME: ""
      # SUPERUSER_PASSWORD: ""
+      # SSO Configuration
+      # SOCIAL_AUTH_OKTA_OPENIDCONNECT_KEY: "your_okta_client_id"
+      # SOCIAL_AUTH_OKTA_OPENIDCONNECT_API_URL: "https://your-domain.okta.com"
+      # SOCIAL_AUTH_GOOGLE_OAUTH2_KEY: "your_google_client_id"
+    # secrets:
+      # - okta_openidconnect_secret
+      # - google_oauth2_secret

+# Uncomment to use Docker secrets for SSO credentials
+# secrets:
+#   okta_openidconnect_secret:
+#     file: ./secrets/okta_secret.txt
+#   google_oauth2_secret:
+#     file: ./secrets/google_secret.txt
--- a/env/netbox.env
+++ b/env/netbox.env
@ -30,4 +30,12 @@ REDIS_SSL=false
 RELEASE_CHECK_URL=https://api.github.com/repos/netbox-community/netbox/releases
 SECRET_KEY='r(m)9nLGnz$(_q3N4z1k(EFsMCjjjzx08x9VhNVcfd%6RF#r!6DE@+V5Zk2X'
 SKIP_SUPERUSER=true
+# SSO Configuration (uncomment and configure as needed)
+# OKTA OpenID Connect
+# SOCIAL_AUTH_OKTA_OPENIDCONNECT_KEY=your_okta_client_id
+# SOCIAL_AUTH_OKTA_OPENIDCONNECT_SECRET=your_okta_client_secret
+# SOCIAL_AUTH_OKTA_OPENIDCONNECT_API_URL=https://your-domain.okta.com
+# Google OAuth2
+# SOCIAL_AUTH_GOOGLE_OAUTH2_KEY=your_google_client_id
+# SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET=your_google_client_secret
 WEBHOOKS_ENABLED=true
--- a/requirements-container.txt
+++ b/requirements-container.txt
@ -3,4 +3,4 @@ dulwich==0.24.2
 python3-saml==1.16.0
 --no-binary lxml
 --no-binary xmlsec
-sentry-sdk[django]==2.39.0
+sentry-sdk[django]==2.40.0
Author	SHA1	Message	Date
Skye Fugate	72c48e6ed3	Merge `39d2b726af` into `f07c9d533d`	2025-10-09 11:42:53 +01:00
Tobias Genannt	f07c9d533d	Merge pull request #1531 from netbox-community/renovate/ghcr.io-astral-sh-uv-0.x Some checks failed push / Checks syntax of our code (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build-latest.sh, ubuntu-24.04) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build-latest.sh, ubuntu-24.04-arm) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build.sh feature, ubuntu-24.04) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build.sh feature, ubuntu-24.04-arm) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build.sh main, ubuntu-24.04) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build.sh main, ubuntu-24.04-arm) (push) Has been cancelled Details push / Builds new NetBox Docker Images (PRERELEASE=true ./build-latest.sh, ubuntu-24.04) (push) Has been cancelled Details push / Builds new NetBox Docker Images (PRERELEASE=true ./build-latest.sh, ubuntu-24.04-arm) (push) Has been cancelled Details Update ghcr.io/astral-sh/uv Docker tag to v0.9	2025-10-08 07:29:21 +02:00
renovate[bot]	7067475a81	Update ghcr.io/astral-sh/uv Docker tag to v0.9	2025-10-08 05:08:30 +00:00
Tobias Genannt	0072d59ea2	Merge pull request #1528 from netbox-community/renovate/sentry-sdk-2.x Some checks failed push / Checks syntax of our code (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build-latest.sh, ubuntu-24.04) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build-latest.sh, ubuntu-24.04-arm) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build.sh feature, ubuntu-24.04) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build.sh feature, ubuntu-24.04-arm) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build.sh main, ubuntu-24.04) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build.sh main, ubuntu-24.04-arm) (push) Has been cancelled Details push / Builds new NetBox Docker Images (PRERELEASE=true ./build-latest.sh, ubuntu-24.04) (push) Has been cancelled Details push / Builds new NetBox Docker Images (PRERELEASE=true ./build-latest.sh, ubuntu-24.04-arm) (push) Has been cancelled Details Update dependency sentry-sdk to v2.40.0	2025-10-06 15:59:15 +02:00
renovate[bot]	88bc5cf8d6	Update dependency sentry-sdk to v2.40.0	2025-10-06 13:37:57 +00:00
Skye A. Fugate	39d2b726af	Secrets example	2025-07-03 13:18:34 -05:00
Skye A. Fugate	eaad696666	feat: add SSO environment variable support for OKTA and Google OAuth2 Add native support for SSO configuration through environment variables and Docker secrets, eliminating the need to modify configuration.py for common SSO providers. Changes: - Add OKTA OpenID Connect configuration variables: - SOCIAL_AUTH_OKTA_OPENIDCONNECT_KEY (env var) - SOCIAL_AUTH_OKTA_OPENIDCONNECT_SECRET (env var + Docker secret: okta_openidconnect_secret) - SOCIAL_AUTH_OKTA_OPENIDCONNECT_API_URL (env var) - Add Google OAuth2 configuration variables: - SOCIAL_AUTH_GOOGLE_OAUTH2_KEY (env var) - SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET (env var + Docker secret: google_oauth2_secret) Follows existing patterns with _read_secret() for sensitive data and environ.get() for non-sensitive configuration. Resolves: netbox-community/netbox-docker#1139	2025-07-03 13:12:52 -05:00