From fff05b315464e2694afe3aa992f01f63fea5bd20 Mon Sep 17 00:00:00 2001
From: Marco Ceppi <marco@ceppi.net>
Date: Thu, 21 Nov 2019 17:23:53 -0500
Subject: [PATCH] Always run *some* startup scripts even when disabled

---
 docker/docker-entrypoint.sh                         | 13 ++++++++-----
 ...stom_fields.py => 020_custom_fields-required.py} |  0
 ...nufacturers.py => 050_manufacturers-required.py} |  0
 ...device_types.py => 060_device_types-required.py} |  0
 ...070_rack_roles.py => 070_rack_roles-required.py} |  0
 ...device_roles.py => 090_device_roles-required.py} |  0
 6 files changed, 8 insertions(+), 5 deletions(-)
 rename docker/startup_scripts/{020_custom_fields.py => 020_custom_fields-required.py} (100%)
 rename docker/startup_scripts/{050_manufacturers.py => 050_manufacturers-required.py} (100%)
 rename docker/startup_scripts/{060_device_types.py => 060_device_types-required.py} (100%)
 rename docker/startup_scripts/{070_rack_roles.py => 070_rack_roles-required.py} (100%)
 rename docker/startup_scripts/{090_device_roles.py => 090_device_roles-required.py} (100%)

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 8922a5d93..5970b4ed4 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -39,15 +39,18 @@ if not User.objects.filter(username='${SUPERUSER_NAME}'):
     Token.objects.create(user=u, key='${SUPERUSER_API_TOKEN}')
 END
 
+startup_scripts=/opt/netbox/startup_scripts/*.py
+
 if [ "$SKIP_STARTUP_SCRIPTS" == "true" ]; then
   echo "☇ Skipping startup scripts"
-else
-  for script in /opt/netbox/startup_scripts/*.py; do
-    echo "⚙️ Executing '$script'"
-    ./manage.py shell --interface python < "${script}"
-  done
+  startup_scripts=/opt/netbox/startup_scripts/*required*.py
 fi
 
+for script in $startup_scripts; do
+  echo "⚙️ Executing '$script'"
+  ./manage.py shell --interface python < "${script}"
+done
+
 # copy static files
 ./manage.py collectstatic --no-input
 
diff --git a/docker/startup_scripts/020_custom_fields.py b/docker/startup_scripts/020_custom_fields-required.py
similarity index 100%
rename from docker/startup_scripts/020_custom_fields.py
rename to docker/startup_scripts/020_custom_fields-required.py
diff --git a/docker/startup_scripts/050_manufacturers.py b/docker/startup_scripts/050_manufacturers-required.py
similarity index 100%
rename from docker/startup_scripts/050_manufacturers.py
rename to docker/startup_scripts/050_manufacturers-required.py
diff --git a/docker/startup_scripts/060_device_types.py b/docker/startup_scripts/060_device_types-required.py
similarity index 100%
rename from docker/startup_scripts/060_device_types.py
rename to docker/startup_scripts/060_device_types-required.py
diff --git a/docker/startup_scripts/070_rack_roles.py b/docker/startup_scripts/070_rack_roles-required.py
similarity index 100%
rename from docker/startup_scripts/070_rack_roles.py
rename to docker/startup_scripts/070_rack_roles-required.py
diff --git a/docker/startup_scripts/090_device_roles.py b/docker/startup_scripts/090_device_roles-required.py
similarity index 100%
rename from docker/startup_scripts/090_device_roles.py
rename to docker/startup_scripts/090_device_roles-required.py