Compare commits
24 Commits
renovate/d
...
renovate/d
| Author | SHA1 | Date | |
|---|---|---|---|
|
88a2e48923 | ||
|
|
81fb62ecef | ||
|
|
2c49500e8d | ||
|
|
c16c79ff16 | ||
|
|
c05e838edc | ||
|
|
a229603d90 | ||
|
|
942fc04776 | ||
|
|
b76bd3d780 | ||
|
|
4744eeb3ef | ||
|
|
bdea0cf05a | ||
|
|
76f670faaa | ||
|
|
263fcf35bf | ||
|
|
fb1cfd880a | ||
|
|
e9a8e14aa8 | ||
|
|
1b0da4048b | ||
|
|
e61aba8388 | ||
|
|
c4f90b7b34 | ||
|
|
8dac9f2dc7 | ||
|
|
51947e4c52 | ||
|
|
af562671e2 | ||
|
|
b97c177df8 | ||
|
|
67eff20f7d | ||
|
|
c49af09fa5 | ||
|
|
71ebfca443 |
2
.github/workflows/push.yml
vendored
2
.github/workflows/push.yml
vendored
@@ -40,6 +40,8 @@ jobs:
|
||||
VALIDATE_DOCKERFILE: false
|
||||
VALIDATE_GITLEAKS: false
|
||||
VALIDATE_JSCPD: false
|
||||
VALIDATE_TRIVY: false
|
||||
VALIDATE_GITHUB_ACTIONS_ZIZMOR: false
|
||||
FILTER_REGEX_EXCLUDE: (.*/)?(LICENSE|configuration/.*)
|
||||
EDITORCONFIG_FILE_NAME: .editorconfig-checker.json
|
||||
DOCKERFILE_HADOLINT_FILE_NAME: .hadolint.yaml
|
||||
|
||||
@@ -79,7 +79,6 @@ COPY ${NETBOX_PATH} /opt/netbox
|
||||
COPY docker/configuration.docker.py /opt/netbox/netbox/netbox/configuration.py
|
||||
COPY docker/ldap_config.docker.py /opt/netbox/netbox/netbox/ldap_config.py
|
||||
COPY docker/docker-entrypoint.sh /opt/netbox/docker-entrypoint.sh
|
||||
COPY docker/housekeeping.sh /opt/netbox/housekeeping.sh
|
||||
COPY docker/launch-netbox.sh /opt/netbox/launch-netbox.sh
|
||||
COPY configuration/ /etc/netbox/config/
|
||||
COPY docker/nginx-unit.json /etc/unit/
|
||||
|
||||
2
build.sh
2
build.sh
@@ -223,7 +223,7 @@ fi
|
||||
###
|
||||
# Variables for labelling the docker image
|
||||
###
|
||||
BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M+00:00')"
|
||||
BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%S+00:00')"
|
||||
|
||||
if [ -d ".git" ] && [ -z "${SKIP_GIT}" ]; then
|
||||
GIT_REF="$(git rev-parse HEAD)"
|
||||
|
||||
@@ -28,18 +28,9 @@ services:
|
||||
start_period: 40s
|
||||
timeout: 3s
|
||||
interval: 15s
|
||||
netbox-housekeeping:
|
||||
<<: *netbox
|
||||
command:
|
||||
- /opt/netbox/housekeeping.sh
|
||||
healthcheck:
|
||||
test: ps -aux | grep -v grep | grep -q housekeeping || exit 1
|
||||
start_period: 40s
|
||||
timeout: 3s
|
||||
interval: 15s
|
||||
|
||||
postgres:
|
||||
image: docker.io/postgres:17-alpine
|
||||
image: docker.io/postgres:18-alpine
|
||||
env_file: env/postgres.env
|
||||
healthcheck:
|
||||
test: pg_isready -q -t 2 -d $$POSTGRES_DB -U $$POSTGRES_USER ## $$ because of docker-compose
|
||||
@@ -49,7 +40,7 @@ services:
|
||||
retries: 5
|
||||
|
||||
redis: &redis
|
||||
image: docker.io/valkey/valkey:9.0-alpine
|
||||
image: docker.io/valkey/valkey:8.1-alpine
|
||||
command:
|
||||
- sh
|
||||
- -c # this is to evaluate the $REDIS_PASSWORD from the env
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
services:
|
||||
netbox: &netbox
|
||||
image: docker.io/netboxcommunity/netbox:${VERSION-v4.3-3.3.0}
|
||||
image: docker.io/netboxcommunity/netbox:${VERSION-v4.4-3.4.0}
|
||||
depends_on:
|
||||
- postgres
|
||||
- redis
|
||||
@@ -31,22 +31,10 @@ services:
|
||||
start_period: 20s
|
||||
timeout: 3s
|
||||
interval: 15s
|
||||
netbox-housekeeping:
|
||||
<<: *netbox
|
||||
depends_on:
|
||||
netbox:
|
||||
condition: service_healthy
|
||||
command:
|
||||
- /opt/netbox/housekeeping.sh
|
||||
healthcheck:
|
||||
test: ps -aux | grep -v grep | grep -q housekeeping || exit 1
|
||||
start_period: 20s
|
||||
timeout: 3s
|
||||
interval: 15s
|
||||
|
||||
# postgres
|
||||
postgres:
|
||||
image: docker.io/postgres:17-alpine
|
||||
image: docker.io/postgres:18-alpine
|
||||
healthcheck:
|
||||
test: pg_isready -q -t 2 -d $$POSTGRES_DB -U $$POSTGRES_USER
|
||||
start_period: 20s
|
||||
@@ -59,7 +47,7 @@ services:
|
||||
|
||||
# redis
|
||||
redis:
|
||||
image: docker.io/valkey/valkey:9.0-alpine
|
||||
image: docker.io/valkey/valkey:8.1-alpine
|
||||
command:
|
||||
- sh
|
||||
- -c # this is to evaluate the $REDIS_PASSWORD from the env
|
||||
@@ -74,7 +62,7 @@ services:
|
||||
volumes:
|
||||
- netbox-redis-data:/data
|
||||
redis-cache:
|
||||
image: docker.io/valkey/valkey:9.0-alpine
|
||||
image: docker.io/valkey/valkey:8.1-alpine
|
||||
command:
|
||||
- sh
|
||||
- -c # this is to evaluate the $REDIS_PASSWORD from the env
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
#!/bin/bash
|
||||
SLEEP_SECONDS=${HOUSEKEEPING_INTERVAL:=86400}
|
||||
echo "Interval set to ${SLEEP_SECONDS} seconds"
|
||||
while true; do
|
||||
date
|
||||
/opt/netbox/venv/bin/python /opt/netbox/netbox/manage.py housekeeping
|
||||
sleep "${SLEEP_SECONDS}s"
|
||||
done
|
||||
1
env/netbox.env
vendored
1
env/netbox.env
vendored
@@ -15,7 +15,6 @@ EMAIL_USERNAME=netbox
|
||||
EMAIL_USE_SSL=false
|
||||
EMAIL_USE_TLS=false
|
||||
GRAPHQL_ENABLED=true
|
||||
HOUSEKEEPING_INTERVAL=86400
|
||||
MEDIA_ROOT=/opt/netbox/netbox/media
|
||||
METRICS_ENABLED=false
|
||||
REDIS_CACHE_DATABASE=1
|
||||
|
||||
@@ -3,4 +3,4 @@ dulwich==0.24.1
|
||||
python3-saml==1.16.0
|
||||
--no-binary lxml
|
||||
--no-binary xmlsec
|
||||
sentry-sdk[django]==2.34.1
|
||||
sentry-sdk[django]==2.39.0
|
||||
|
||||
Reference in New Issue
Block a user