Skip to content

Commit

Permalink
Merge pull request #1379 from netbox-community/develop
Browse files Browse the repository at this point in the history
Version 3.1.1
  • Loading branch information
tobiasge authored Jan 20, 2025
2 parents bd9bdd0 + e48a1b6 commit afc10aa
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get update -qq \
&& apt-get install \
--yes -qq --no-install-recommends \
unit=1.34.0-1~noble \
unit-python3.12=1.34.0-1~noble \
unit=1.34.1-1~noble \
unit-python3.12=1.34.1-1~noble \
&& rm -rf /var/lib/apt/lists/*

COPY --from=builder /opt/netbox/venv /opt/netbox/venv
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.0
3.1.1
2 changes: 2 additions & 0 deletions configuration/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -348,3 +348,5 @@ def _environ_get_and_map(variable_name: str, default: str | None = None, map_fn:
# Time zone (default: UTC)
TIME_ZONE = environ.get('TIME_ZONE', 'UTC')

# If true disables miscellaneous functionality which depends on access to the Internet.
ISOLATED_DEPLOYMENT = _environ_get_and_map('ISOLATED_DEPLOYMENT', 'False', _AS_BOOL)
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
netbox: &netbox
image: docker.io/netboxcommunity/netbox:${VERSION-v4.2-3.1.0}
image: docker.io/netboxcommunity/netbox:${VERSION-v4.2-3.1.1}
depends_on:
- postgres
- redis
Expand Down
2 changes: 1 addition & 1 deletion requirements-container.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ django-auth-ldap==5.1.0
django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.14.4
dulwich==0.22.7
python3-saml==1.16.0 --no-binary lxml,xmlsec
sentry-sdk[django]==2.19.2
sentry-sdk[django]==2.20.0

0 comments on commit afc10aa

Please sign in to comment.