Compare commits

..

6 Commits

Author SHA1 Message Date
Benjamin Reed
5f362a9f85 ENT-23: add hooks for running pre- and post-init scripts 2024-05-15 13:08:12 -04:00
Tobias Genannt
1265d2277a Preparation for 2.9.1 2024-05-07 13:45:53 +02:00
Tobias Genannt
620ca96d64 Merge pull request #1224 from tobiasge/fix-sentry-sdk
Install Sentry Django integration correctly
2024-05-07 12:34:09 +02:00
Tobias Genannt
2561055265 Install Sentry Django integration correctly 2024-05-07 09:57:59 +02:00
Tobias Genannt
53ac2ff81b Merge pull request #1223 from tobiasge/1222-fix-health-check
Fix #1222: Use /login/ as health check URL
2024-05-07 08:37:20 +02:00
Tobias Genannt
b6492b2e6b Fix #1222: Use /login/ as health check URL 2024-05-07 07:15:37 +02:00
4 changed files with 23 additions and 6 deletions

View File

@@ -1 +1 @@
2.9.0
2.9.1

View File

@@ -1,6 +1,6 @@
services:
netbox: &netbox
image: docker.io/netboxcommunity/netbox:${VERSION-v4.0-2.9.0}
image: docker.io/netboxcommunity/netbox:${VERSION-v4.0-2.9.1}
depends_on:
- postgres
- redis
@@ -11,9 +11,10 @@ services:
start_period: 60s
timeout: 3s
interval: 15s
test: "curl -f http://localhost:8080/api/ || exit 1"
test: "curl -f http://localhost:8080/login/ || exit 1"
volumes:
- ./configuration:/etc/netbox/config:z,ro
- init-files:/opt/init:ro
- netbox-media-files:/opt/netbox/netbox/media:rw
- netbox-reports-files:/opt/netbox/netbox/reports:rw
- netbox-scripts-files:/opt/netbox/netbox/scripts:rw
@@ -72,6 +73,8 @@ services:
- netbox-redis-cache-data:/data
volumes:
init-files:
driver: local
netbox-media-files:
driver: local
netbox-postgres-data:

View File

@@ -1,12 +1,19 @@
#!/bin/bash
# Runs on every start of the NetBox Docker container
# Stop when an error occures
# Stop when an error occurs
set -e
# Allows NetBox to be run as non-root users
umask 002
if [ -d /opt/init/pre ]; then
find /opt/init/pre -type f -name \*.sh | sort -u | while read -r FILE; do
echo "⚙️ Running pre-init script '${FILE}'..."
/bin/bash -e "${FILE}" "$@"
done
fi
# Load correct Python3 env
# shellcheck disable=SC1091
source /opt/netbox/venv/bin/activate
@@ -91,8 +98,15 @@ except Token.DoesNotExist:
pass
END
if [ -d /opt/init/post ]; then
find /opt/init/post -type f -name \*.sh | sort -u | while read -r FILE; do
echo "⚙️ Running post-init script '${FILE}'..."
/bin/bash -e "${FILE}" "$@"
done
fi
echo "✅ Initialisation is done."
# Launch whatever is passed by docker
# (i.e. the RUN instruction in the Dockerfile)
# (i.e. the CMD instruction in the Dockerfile)
exec "$@"

View File

@@ -2,4 +2,4 @@ django-auth-ldap==4.8.0
django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.14.3
dulwich==0.22.1
python3-saml==1.16.0 --no-binary lxml
sentry-sdk==2.1.1
sentry-sdk[django]==2.1.1