From 4d320f34d50fe56b1cfedaa9c6407934c2f5189d Mon Sep 17 00:00:00 2001
From: Tobias Genannt <tobias.genannt@gmail.com>
Date: Wed, 5 May 2021 11:31:32 +0200
Subject: [PATCH 01/27] Optimise migrations on startup

The migrations are only started if there are some that have not been
applied. Additionally the maintenace task needed after an update are
now run after the migrations
---
 docker/docker-entrypoint.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index c39453d83..6173db13b 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -15,7 +15,7 @@ source /opt/netbox/venv/bin/activate
 DB_WAIT_TIMEOUT=${DB_WAIT_TIMEOUT-3}
 MAX_DB_WAIT_TIME=${MAX_DB_WAIT_TIME-30}
 CUR_DB_WAIT_TIME=0
-while ! ./manage.py migrate 2>&1 && [ "${CUR_DB_WAIT_TIME}" -lt "${MAX_DB_WAIT_TIME}" ]; do
+while ! ./manage.py showmigrations >/dev/null 2>&1 && [ "${CUR_DB_WAIT_TIME}" -lt "${MAX_DB_WAIT_TIME}" ]; do
   echo "⏳ Waiting on DB... (${CUR_DB_WAIT_TIME}s / ${MAX_DB_WAIT_TIME}s)"
   sleep "${DB_WAIT_TIMEOUT}"
   CUR_DB_WAIT_TIME=$((CUR_DB_WAIT_TIME + DB_WAIT_TIMEOUT))
@@ -24,6 +24,19 @@ if [ "${CUR_DB_WAIT_TIME}" -ge "${MAX_DB_WAIT_TIME}" ]; then
   echo "❌ Waited ${MAX_DB_WAIT_TIME}s or more for the DB to become ready."
   exit 1
 fi
+# Check if update is needed
+if ! ./manage.py migrate --check >/dev/null 2>&1; then
+  echo "⚙️ Applying database migrations"
+  ./manage.py migrate --no-input
+  echo "⚙️ Running trace_paths"
+  ./manage.py trace_paths --no-input
+  echo "⚙️ Removing stale content types"
+  ./manage.py remove_stale_contenttypes --no-input
+  echo "⚙️ Removing expired user sessions"
+  ./manage.py clearsessions
+  echo "⚙️ Clearing cache data"
+  ./manage.py invalidate all
+fi
 
 # Create Superuser if required
 if [ "$SKIP_SUPERUSER" == "true" ]; then

From e2cc9386fb0ee5e9cd3b3789eefae294f6ec5653 Mon Sep 17 00:00:00 2001
From: Tobias Genannt <tobias.genannt@gmail.com>
Date: Tue, 18 May 2021 09:32:48 +0200
Subject: [PATCH 02/27] Secrets are removed in Netbox 2.12

---
 initializers/secret_roles.yml       |  4 ----
 startup_scripts/310_secret_roles.py | 15 ---------------
 2 files changed, 19 deletions(-)
 delete mode 100644 initializers/secret_roles.yml
 delete mode 100644 startup_scripts/310_secret_roles.py

diff --git a/initializers/secret_roles.yml b/initializers/secret_roles.yml
deleted file mode 100644
index 239906a44..000000000
--- a/initializers/secret_roles.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-# - name: Super Secret Passwords
-#   slug: super-secret
-# - name: SNMP Communities
-#   slug: snmp
diff --git a/startup_scripts/310_secret_roles.py b/startup_scripts/310_secret_roles.py
deleted file mode 100644
index 02dcd88a6..000000000
--- a/startup_scripts/310_secret_roles.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import sys
-from secrets.models import SecretRole
-
-from startup_script_utils import load_yaml
-
-secret_roles = load_yaml("/opt/netbox/initializers/secret_roles.yml")
-
-if secret_roles is None:
-    sys.exit()
-
-for params in secret_roles:
-    secret_role, created = SecretRole.objects.get_or_create(**params)
-
-    if created:
-        print("🔑 Created Secret Role", secret_role.name)

From 02f30f3a682b9752c0ebe4eec5701efe733af357 Mon Sep 17 00:00:00 2001
From: Tobias Genannt <tobias.genannt@gmail.com>
Date: Tue, 18 May 2021 09:34:44 +0200
Subject: [PATCH 03/27] 'ttf-ubuntu-font-family' was remove from Alpine

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 280a9c6ea..0653100a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,7 +50,6 @@ RUN apk add --no-cache \
       postgresql-libs \
       python3 \
       py3-pip \
-      ttf-ubuntu-font-family \
       unit \
       unit-python3
 

From 49b7c267b9650ef44131fa87120e63fb6672162c Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 18 May 2021 08:03:10 +0000
Subject: [PATCH 04/27] Update postgres Docker tag to v13

---
 docker-compose.test.yml | 2 +-
 docker-compose.yml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 8233bf6ef..df681d2c6 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -20,7 +20,7 @@ services:
     ports:
     - 8080
   postgres:
-    image: postgres:12-alpine
+    image: postgres:13-alpine
     env_file: env/postgres.env
   redis:
     image: redis:6-alpine
diff --git a/docker-compose.yml b/docker-compose.yml
index 7bec1770f..5bdba37b3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,7 +29,7 @@ services:
 
   # postgres
   postgres:
-    image: postgres:12-alpine
+    image: postgres:13-alpine
     env_file: env/postgres.env
     volumes:
     - netbox-postgres-data:/var/lib/postgresql/data

From 240326ef37e09ed1a5b5781f1873bec5a2eea088 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 18 May 2021 13:30:10 +0000
Subject: [PATCH 05/27] Update dependency napalm to v3.3.0

---
 requirements-container.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-container.txt b/requirements-container.txt
index 450c3227b..e5a2aae65 100644
--- a/requirements-container.txt
+++ b/requirements-container.txt
@@ -1,4 +1,4 @@
-napalm==3.2.0
+napalm==3.3.0
 ruamel.yaml==0.17.4
 django-auth-ldap==2.4.0
 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.11.1

From dd732d7bc20b21bad77407c2e840f84a40aabaec Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 25 May 2021 20:35:56 +0000
Subject: [PATCH 06/27] Update github/super-linter action to v4

---
 .github/workflows/push.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 3293aff86..608e6e051 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -19,7 +19,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-python@v2
     - name: Lint Code Base
-      uses: github/super-linter@v3
+      uses: github/super-linter@v4
       env:
         DEFAULT_BRANCH: develop
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 5b618851c08c3796f45b98a9a95a62c1c055b7aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ma=CC=88der?= <mail@cimnine.ch>
Date: Wed, 26 May 2021 19:05:37 +0200
Subject: [PATCH 07/27] Pin the NetBox Docker version in the docker-compose.yml
 file

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5bdba37b3..745055c5b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   netbox: &netbox
-    image: netboxcommunity/netbox:${VERSION-latest}
+    image: netboxcommunity/netbox:${VERSION-v2.11}
     depends_on:
     - postgres
     - redis

From 057728b774140e37b04af3b66ab2aa03a38866b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jelizaveta=20Leme=C5=A1eva?=
 <jelizaveta.lemeseva@vinted.com>
Date: Fri, 28 May 2021 11:13:31 +0300
Subject: [PATCH 08/27] Allow sites to be initialized with tenants

---
 initializers/sites.yml                                         | 1 +
 startup_scripts/{110_tenant_groups.py => 020_tenant_groups.py} | 0
 startup_scripts/{120_tenants.py => 030_tenants.py}             | 0
 3 files changed, 1 insertion(+)
 rename startup_scripts/{110_tenant_groups.py => 020_tenant_groups.py} (100%)
 rename startup_scripts/{120_tenants.py => 030_tenants.py} (100%)

diff --git a/initializers/sites.yml b/initializers/sites.yml
index 0015f4e80..bbda54e8b 100644
--- a/initializers/sites.yml
+++ b/initializers/sites.yml
@@ -28,5 +28,6 @@
 #   status: active
 #   facility: Singapore 1
 #   asn: 09876
+#   tenant: tenant1
 #   custom_field_data:
 #     text_field: Description for SING1
diff --git a/startup_scripts/110_tenant_groups.py b/startup_scripts/020_tenant_groups.py
similarity index 100%
rename from startup_scripts/110_tenant_groups.py
rename to startup_scripts/020_tenant_groups.py
diff --git a/startup_scripts/120_tenants.py b/startup_scripts/030_tenants.py
similarity index 100%
rename from startup_scripts/120_tenants.py
rename to startup_scripts/030_tenants.py

From f4e9ebcfb5e4cae903918fb8014421cd3ac2360b Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 31 May 2021 08:58:27 +0000
Subject: [PATCH 09/27] Update dependency ruamel.yaml to v0.17.6

---
 requirements-container.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-container.txt b/requirements-container.txt
index e5a2aae65..d441254ef 100644
--- a/requirements-container.txt
+++ b/requirements-container.txt
@@ -1,4 +1,4 @@
 napalm==3.3.0
-ruamel.yaml==0.17.4
+ruamel.yaml==0.17.6
 django-auth-ldap==2.4.0
 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.11.1

From 3aad44d68c5f3fe86767c164a1049ef77719ef0f Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 31 May 2021 15:28:52 +0000
Subject: [PATCH 10/27] Update dependency ruamel.yaml to v0.17.7

---
 requirements-container.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-container.txt b/requirements-container.txt
index d441254ef..486dca9d9 100644
--- a/requirements-container.txt
+++ b/requirements-container.txt
@@ -1,4 +1,4 @@
 napalm==3.3.0
-ruamel.yaml==0.17.6
+ruamel.yaml==0.17.7
 django-auth-ldap==2.4.0
 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.11.1

From 15b097bd3eb9427ddb9df6d4dc9a60f2513163aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jelizaveta=20Leme=C5=A1eva?=
 <jelizaveta.lemeseva@vinted.com>
Date: Tue, 1 Jun 2021 14:22:08 +0300
Subject: [PATCH 11/27] Add second tenant with group to site

---
 initializers/sites.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/initializers/sites.yml b/initializers/sites.yml
index bbda54e8b..7ace3aa9a 100644
--- a/initializers/sites.yml
+++ b/initializers/sites.yml
@@ -20,6 +20,7 @@
 #   status: active
 #   facility: Amsterdam 3
 #   asn: 67890
+#   tenant: tenant1
 #   custom_field_data:
 #     text_field: Description for AMS3
 # - name: SING 1
@@ -28,6 +29,6 @@
 #   status: active
 #   facility: Singapore 1
 #   asn: 09876
-#   tenant: tenant1
+#   tenant: tenant2
 #   custom_field_data:
 #     text_field: Description for SING1

From 98840382b9fbfe5943ee04710f26d7781e1e9eb4 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 9 Jun 2021 13:53:48 +0000
Subject: [PATCH 12/27] Update dependency ruamel.yaml to v0.17.8

---
 requirements-container.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-container.txt b/requirements-container.txt
index 486dca9d9..016bb1661 100644
--- a/requirements-container.txt
+++ b/requirements-container.txt
@@ -1,4 +1,4 @@
 napalm==3.3.0
-ruamel.yaml==0.17.7
+ruamel.yaml==0.17.8
 django-auth-ldap==2.4.0
 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.11.1

From e38d646e8e40f7ee1e79ba9b9b50118cd8f06512 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 10 Jun 2021 06:57:09 +0000
Subject: [PATCH 13/27] Update dependency ruamel.yaml to v0.17.9

---
 requirements-container.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-container.txt b/requirements-container.txt
index 016bb1661..0512848e8 100644
--- a/requirements-container.txt
+++ b/requirements-container.txt
@@ -1,4 +1,4 @@
 napalm==3.3.0
-ruamel.yaml==0.17.8
+ruamel.yaml==0.17.9
 django-auth-ldap==2.4.0
 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.11.1

From 6bbc7a3a8448166ffc51aaa9e3389e6deee8b617 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 18 Jun 2021 12:29:27 +0000
Subject: [PATCH 14/27] Update dependency napalm to v3.3.1

---
 requirements-container.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-container.txt b/requirements-container.txt
index 0512848e8..dd03b10b5 100644
--- a/requirements-container.txt
+++ b/requirements-container.txt
@@ -1,4 +1,4 @@
-napalm==3.3.0
+napalm==3.3.1
 ruamel.yaml==0.17.9
 django-auth-ldap==2.4.0
 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.11.1

From abfa6c989fe272bebcfe0f858343f36b622fdcf2 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 24 Jun 2021 09:38:10 +0000
Subject: [PATCH 15/27] Update dependency ruamel.yaml to v0.17.10

---
 requirements-container.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-container.txt b/requirements-container.txt
index dd03b10b5..1ddae3846 100644
--- a/requirements-container.txt
+++ b/requirements-container.txt
@@ -1,4 +1,4 @@
 napalm==3.3.1
-ruamel.yaml==0.17.9
+ruamel.yaml==0.17.10
 django-auth-ldap==2.4.0
 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.11.1

From dd41d09b4312bc5fbd5ab22a52cff0d19120e8f9 Mon Sep 17 00:00:00 2001
From: Ageev Pavel <ageev.pavel.v@gmail.com>
Date: Thu, 24 Jun 2021 18:21:08 +0300
Subject: [PATCH 16/27] Add possibility to disable server side cursors

---
 configuration/configuration.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configuration/configuration.py b/configuration/configuration.py
index 727f7b30d..18e14a9df 100644
--- a/configuration/configuration.py
+++ b/configuration/configuration.py
@@ -48,6 +48,8 @@ def _read_secret(secret_name, default = None):
                                                     # Database connection SSLMODE
     'CONN_MAX_AGE': int(environ.get('DB_CONN_MAX_AGE', '300')),
                                                     # Max database connection age
+    'DISABLE_SERVER_SIDE_CURSORS': environ.get('DB_DISABLE_SERVER_SIDE_CURSORS', 'False').lower() == 'true',
+                                                    # Disable the use of server-side cursors transaction pooling
 }
 
 # Redis database settings. Redis is used for caching and for queuing background tasks such as webhook events. A separate

From b2ee4688714d570c0ea7f64fd32947aaed1c32bc Mon Sep 17 00:00:00 2001
From: Tobias Genannt <t.genannt@scanplus.de>
Date: Mon, 21 Jun 2021 13:17:08 +0200
Subject: [PATCH 17/27] Alpine update to 3.14

---
 Dockerfile | 4 ++--
 build.sh   | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0653100a9..68f41f520 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ RUN apk add --no-cache \
       jpeg-dev \
       libevent-dev \
       libffi-dev \
-      libressl-dev \
+      openssl-dev \
       libxslt-dev \
       musl-dev \
       openldap-dev \
@@ -45,7 +45,7 @@ RUN apk add --no-cache \
       libevent \
       libffi \
       libjpeg-turbo \
-      libressl \
+      openssl \
       libxslt \
       postgresql-libs \
       python3 \
diff --git a/build.sh b/build.sh
index 82084bfe8..e98041134 100755
--- a/build.sh
+++ b/build.sh
@@ -49,7 +49,7 @@ if [ "${1}x" == "x" ] || [ "${1}" == "--help" ] || [ "${1}" == "-h" ]; then
   echo "  DOCKERFILE  The name of Dockerfile to use."
   echo "              Default: Dockerfile"
   echo "  DOCKER_FROM The base image to use."
-  echo "              Default: 'alpine:3.13'"
+  echo "              Default: 'alpine:3.14'"
   echo "  DOCKER_TARGET A specific target to build."
   echo "              It's currently not possible to pass multiple targets."
   echo "              Default: main ldap"
@@ -125,7 +125,7 @@ if [ "${2}" != "--push-only" ] && [ -z "${SKIP_GIT}" ]; then
 
   (
     $DRY cd "${NETBOX_PATH}"
-
+    # shellcheck disable=SC2030
     if [ -n "${HTTP_PROXY}" ]; then
       git config http.proxy "${HTTP_PROXY}"
     fi
@@ -157,7 +157,7 @@ fi
 # Determining the value for DOCKER_FROM
 ###
 if [ -z "$DOCKER_FROM" ]; then
-  DOCKER_FROM="alpine:3.13"
+  DOCKER_FROM="alpine:3.14"
 fi
 
 ###
@@ -345,6 +345,7 @@ for DOCKER_TARGET in "${DOCKER_TARGETS[@]}"; do
     if [ -n "${DOCKER_FROM}" ]; then
       DOCKER_BUILD_ARGS+=(--build-arg "FROM=${DOCKER_FROM}")
     fi
+    # shellcheck disable=SC2031
     if [ -n "${HTTP_PROXY}" ]; then
       DOCKER_BUILD_ARGS+=(--build-arg "http_proxy=${HTTP_PROXY}")
       DOCKER_BUILD_ARGS+=(--build-arg "https_proxy=${HTTPS_PROXY}")

From 275d2673b417e370638b4df18f05958aae779686 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 19 Jul 2021 07:56:47 +0000
Subject: [PATCH 18/27] Update dependency django-auth-ldap to v3

---
 requirements-container.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-container.txt b/requirements-container.txt
index 1ddae3846..bab9e1758 100644
--- a/requirements-container.txt
+++ b/requirements-container.txt
@@ -1,4 +1,4 @@
 napalm==3.3.1
 ruamel.yaml==0.17.10
-django-auth-ldap==2.4.0
+django-auth-ldap==3.0.0
 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.11.1

From 18ea22010208c2da1d53cd446845ca68417d56e7 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 19 Aug 2021 06:45:17 +0000
Subject: [PATCH 19/27] Update dependency ruamel.yaml to v0.17.11

---
 requirements-container.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-container.txt b/requirements-container.txt
index bab9e1758..b3decd9b6 100644
--- a/requirements-container.txt
+++ b/requirements-container.txt
@@ -1,4 +1,4 @@
 napalm==3.3.1
-ruamel.yaml==0.17.10
+ruamel.yaml==0.17.11
 django-auth-ldap==3.0.0
 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.11.1

From 289540f576360f35080d32f4a8c13956d41c27b2 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 21 Aug 2021 14:53:54 +0000
Subject: [PATCH 20/27] Update dependency ruamel.yaml to v0.17.13

---
 requirements-container.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-container.txt b/requirements-container.txt
index b3decd9b6..04b1c3166 100644
--- a/requirements-container.txt
+++ b/requirements-container.txt
@@ -1,4 +1,4 @@
 napalm==3.3.1
-ruamel.yaml==0.17.11
+ruamel.yaml==0.17.13
 django-auth-ldap==3.0.0
 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.11.1

From 9142aaf78ea8e6b8cba611b59617aaac9a2cb6fa Mon Sep 17 00:00:00 2001
From: Tobias Genannt <tobias.genannt@gmail.com>
Date: Sat, 10 Jul 2021 09:47:54 +0200
Subject: [PATCH 21/27] django-cacheops has been removed from Netbox 3.0.0

---
 docker/docker-entrypoint.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 6173db13b..1610d8f44 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -34,8 +34,6 @@ if ! ./manage.py migrate --check >/dev/null 2>&1; then
   ./manage.py remove_stale_contenttypes --no-input
   echo "⚙️ Removing expired user sessions"
   ./manage.py clearsessions
-  echo "⚙️ Clearing cache data"
-  ./manage.py invalidate all
 fi
 
 # Create Superuser if required

From 9d476fa9aff1998a097c86abd13420f16147d18c Mon Sep 17 00:00:00 2001
From: Tobias Genannt <tobias.genannt@gmail.com>
Date: Wed, 21 Jul 2021 09:58:27 +0200
Subject: [PATCH 22/27] Build documentation files in the image

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 68f41f520..c636a04f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -74,6 +74,8 @@ WORKDIR /opt/netbox/netbox
 # to g+w so that pictures can be uploaded to netbox.
 RUN mkdir -p static /opt/unit/state/ /opt/unit/tmp/ \
       && chmod -R g+w media /opt/unit/ \
+      && cd /opt/netbox/ && /opt/netbox/venv/bin/python -m mkdocs build \
+          --config-file /opt/netbox/mkdocs.yml --site-dir /opt/netbox/netbox/project-static/docs/ \
       && SECRET_KEY="dummy" /opt/netbox/venv/bin/python /opt/netbox/netbox/manage.py collectstatic --no-input
 
 ENTRYPOINT [ "/opt/netbox/docker-entrypoint.sh" ]

From c5a1557800dda4679bb78a9b3a81450d243b25e1 Mon Sep 17 00:00:00 2001
From: Tobias Genannt <tobias.genannt@gmail.com>
Date: Fri, 30 Jul 2021 21:57:50 +0200
Subject: [PATCH 23/27] Removed deprecated settings

---
 configuration/configuration.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/configuration/configuration.py b/configuration/configuration.py
index 18e14a9df..87435cf06 100644
--- a/configuration/configuration.py
+++ b/configuration/configuration.py
@@ -108,9 +108,6 @@ def _read_secret(secret_name, default = None):
 # BASE_PATH = 'netbox/'
 BASE_PATH = environ.get('BASE_PATH', '')
 
-# Cache timeout in seconds. Set to 0 to dissable caching. Defaults to 900 (15 minutes)
-CACHE_TIMEOUT = int(environ.get('CACHE_TIMEOUT', 900))
-
 # Maximum number of days to retain logged changes. Set to 0 to retain changes indefinitely. (Default: 90)
 CHANGELOG_RETENTION = int(environ.get('CHANGELOG_RETENTION', 90))
 
@@ -212,9 +209,6 @@ def _read_secret(secret_name, default = None):
 REMOTE_AUTH_AUTO_CREATE_USER = environ.get('REMOTE_AUTH_AUTO_CREATE_USER', 'True').lower() == 'true'
 REMOTE_AUTH_DEFAULT_GROUPS = list(filter(None, environ.get('REMOTE_AUTH_DEFAULT_GROUPS', '').split(' ')))
 
-# This determines how often the GitHub API is called to check the latest release of NetBox. Must be at least 1 hour.
-RELEASE_CHECK_TIMEOUT = int(environ.get('RELEASE_CHECK_TIMEOUT', 24 * 3600))
-
 # 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.
 # https://api.github.com/repos/netbox-community/netbox/releases

From 9b6c476bf99b42d1039e4a308b786d8435075a24 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 25 Aug 2021 20:34:39 +0000
Subject: [PATCH 24/27] Update dependency ruamel.yaml to v0.17.14

---
 requirements-container.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-container.txt b/requirements-container.txt
index 04b1c3166..e1fc2b119 100644
--- a/requirements-container.txt
+++ b/requirements-container.txt
@@ -1,4 +1,4 @@
 napalm==3.3.1
-ruamel.yaml==0.17.13
+ruamel.yaml==0.17.14
 django-auth-ldap==3.0.0
 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.11.1

From 3af075e039974d8830700ed6aac25898f2d00159 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sun, 29 Aug 2021 13:05:16 +0000
Subject: [PATCH 25/27] Update dependency ruamel.yaml to v0.17.16

---
 requirements-container.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-container.txt b/requirements-container.txt
index e1fc2b119..cc48128cc 100644
--- a/requirements-container.txt
+++ b/requirements-container.txt
@@ -1,4 +1,4 @@
 napalm==3.3.1
-ruamel.yaml==0.17.14
+ruamel.yaml==0.17.16
 django-auth-ldap==3.0.0
 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.11.1

From 650e62f44f9c6c6650ab3714cfc191bec9c240f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20M=C3=A4der?= <cimnine@users.noreply.github.com>
Date: Mon, 30 Aug 2021 12:31:36 +0200
Subject: [PATCH 26/27] Disable Renovate's "Dependency Dashboard"

---
 renovate.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/renovate.json b/renovate.json
index b98598c4b..ac1b258b8 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,6 +1,7 @@
 {
   "extends": [
-    "config:base"
+    "config:base",
+    ":disableDependencyDashboard"
   ],
   "enabled": true,
   "labels": ["maintenance"],

From 8e0c795791a9997958f38638a90ade4fcbb57255 Mon Sep 17 00:00:00 2001
From: Tobias Genannt <tobias.genannt@gmail.com>
Date: Mon, 30 Aug 2021 21:07:01 +0200
Subject: [PATCH 27/27] Prepare version 1.3.0

---
 VERSION            | 2 +-
 docker-compose.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 26aaba0e8..f0bb29e76 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.0
+1.3.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 745055c5b..e38aa0c7a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   netbox: &netbox
-    image: netboxcommunity/netbox:${VERSION-v2.11}
+    image: netboxcommunity/netbox:${VERSION-v3.0}
     depends_on:
     - postgres
     - redis