Merge 39d2b726af into 0e66fbad47

Merge pull request #1478 from dawnstrider/develop
Fixed typo for BUILDX_PLATFORM variable
2025-12-10 22:02:37 +00:00 · 2025-07-08 07:37:59 +02:00 · 2025-07-08 07:19:23 +02:00 · 2025-07-07 23:08:49 +02:00 · 2025-07-03 13:18:34 -05:00 · 2025-07-03 13:12:52 -05:00
4 changed files with 28 additions and 1 deletions
--- a/build.sh
+++ b/build.sh
@ -62,7 +62,7 @@ DOCKERFILE  The name of Dockerfile to use.
 DOCKER_FROM The base image to use.
            ${_GREEN}Default:${_CLEAR} 'ubuntu:24.04'
-BUILDX_PLATFORMS
+BUILDX_PLATFORM
            Specifies the platform(s) to build the image for.
            ${_CYAN}Example:${_CLEAR} 'linux/amd64,linux/arm64'
            ${_GREEN}Default:${_CLEAR} 'linux/amd64'
--- a/configuration/configuration.py
+++ b/configuration/configuration.py
@ -303,6 +303,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
@ -31,4 +31,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
Author	SHA1	Message	Date
Skye Fugate	965ef27421	Merge `39d2b726af` into `0e66fbad47`	2025-07-08 07:37:59 +02:00
Tobias Genannt	0e66fbad47	Merge pull request #1478 from dawnstrider/develop 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 Fixed typo for BUILDX_PLATFORM variable	2025-07-08 07:19:23 +02:00
dawnstrider	3320c5d82f	Fixed typo for BUILDX_PLATFORM variable The help prints the variable name as BUILDX_PLATFORMS whereas the code uses BUILDX_PLATFORM	2025-07-07 23:08:49 +02: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
Tobias Genannt	477decd80a	Merge pull request #1450 from netbox-community/develop Version 3.3.0	2025-05-05 07:51:26 +02:00