Skip to content

Commit 1fd8d10

Browse files
authored
Merge pull request #543 from tobiasge/prepare-3.0.0
Prepare for Netbox v3.0.0
2 parents fe4df4f + c5a1557 commit 1fd8d10

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ WORKDIR /opt/netbox/netbox
7474
# to g+w so that pictures can be uploaded to netbox.
7575
RUN mkdir -p static /opt/unit/state/ /opt/unit/tmp/ \
7676
&& chmod -R g+w media /opt/unit/ \
77+
&& cd /opt/netbox/ && /opt/netbox/venv/bin/python -m mkdocs build \
78+
--config-file /opt/netbox/mkdocs.yml --site-dir /opt/netbox/netbox/project-static/docs/ \
7779
&& SECRET_KEY="dummy" /opt/netbox/venv/bin/python /opt/netbox/netbox/manage.py collectstatic --no-input
7880

7981
ENTRYPOINT [ "/opt/netbox/docker-entrypoint.sh" ]

configuration/configuration.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,6 @@ def _read_secret(secret_name, default = None):
108108
# BASE_PATH = 'netbox/'
109109
BASE_PATH = environ.get('BASE_PATH', '')
110110

111-
# Cache timeout in seconds. Set to 0 to dissable caching. Defaults to 900 (15 minutes)
112-
CACHE_TIMEOUT = int(environ.get('CACHE_TIMEOUT', 900))
113-
114111
# Maximum number of days to retain logged changes. Set to 0 to retain changes indefinitely. (Default: 90)
115112
CHANGELOG_RETENTION = int(environ.get('CHANGELOG_RETENTION', 90))
116113

@@ -212,9 +209,6 @@ def _read_secret(secret_name, default = None):
212209
REMOTE_AUTH_AUTO_CREATE_USER = environ.get('REMOTE_AUTH_AUTO_CREATE_USER', 'True').lower() == 'true'
213210
REMOTE_AUTH_DEFAULT_GROUPS = list(filter(None, environ.get('REMOTE_AUTH_DEFAULT_GROUPS', '').split(' ')))
214211

215-
# This determines how often the GitHub API is called to check the latest release of NetBox. Must be at least 1 hour.
216-
RELEASE_CHECK_TIMEOUT = int(environ.get('RELEASE_CHECK_TIMEOUT', 24 * 3600))
217-
218212
# This repository is used to check whether there is a new release of NetBox available. Set to None to disable the
219213
# version check or use the URL below to check for release in the official NetBox repository.
220214
# https://api.github.com/repos/netbox-community/netbox/releases

docker/docker-entrypoint.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ if ! ./manage.py migrate --check >/dev/null 2>&1; then
3434
./manage.py remove_stale_contenttypes --no-input
3535
echo "⚙️ Removing expired user sessions"
3636
./manage.py clearsessions
37-
echo "⚙️ Clearing cache data"
38-
./manage.py invalidate all
3937
fi
4038

4139
# Create Superuser if required

0 commit comments

Comments
 (0)