diff --git a/.gitignore b/.gitignore index 9a5e13a4b..2fb516639 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ *.sql.gz .netbox -.initializers +.python-version docker-compose.override.yml *.pem configuration/* @@ -11,5 +11,4 @@ configuration/ldap/* !configuration/ldap/ldap_config.py !configuration/logging.py !configuration/plugins.py -prometheus.yml super-linter.log diff --git a/Dockerfile b/Dockerfile index 11fa4ac20..bd00e9032 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,15 +66,15 @@ RUN export DEBIAN_FRONTEND=noninteractive \ python3 \ python3-distutils \ tini \ - && curl -sL https://nginx.org/keys/nginx_signing.key \ - > /etc/apt/trusted.gpg.d/nginx.asc && \ - echo "deb https://packages.nginx.org/unit/ubuntu/ jammy unit" \ + && curl --silent --output /usr/share/keyrings/nginx-keyring.gpg \ + https://unit.nginx.org/keys/nginx-keyring.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/nginx-keyring.gpg] https://packages.nginx.org/unit/ubuntu/ lunar unit" \ > /etc/apt/sources.list.d/unit.list \ && apt-get update -qq \ && apt-get install \ --yes -qq --no-install-recommends \ - unit=1.29.1-1~jammy \ - unit-python3.10=1.29.1-1~jammy \ + unit=1.30.0-1~lunar \ + unit-python3.11=1.30.0-1~lunar \ && rm -rf /var/lib/apt/lists/* COPY --from=builder /opt/netbox/venv /opt/netbox/venv diff --git a/build.sh b/build.sh index 5bbaf4d95..fd340299f 100755 --- a/build.sh +++ b/build.sh @@ -61,7 +61,7 @@ DOCKERFILE The name of Dockerfile to use. ${_GREEN}Default:${_CLEAR} Dockerfile DOCKER_FROM The base image to use. - ${_GREEN}Default:${_CLEAR} 'ubuntu:22.04' + ${_GREEN}Default:${_CLEAR} 'ubuntu:23.04' BUILDX_PLATFORMS Specifies the platform(s) to build the image for. @@ -219,7 +219,7 @@ fi # Determining the value for DOCKER_FROM ### if [ -z "$DOCKER_FROM" ]; then - DOCKER_FROM="docker.io/ubuntu:22.04" + DOCKER_FROM="docker.io/ubuntu:23.04" fi ### diff --git a/docker/launch-netbox.sh b/docker/launch-netbox.sh index 510c5c854..6cc63ba01 100755 --- a/docker/launch-netbox.sh +++ b/docker/launch-netbox.sh @@ -51,7 +51,7 @@ exec unitd \ --control unix:$UNIT_SOCKET \ --pid /opt/unit/unit.pid \ --log /dev/stdout \ - --state /opt/unit/state/ \ - --tmp /opt/unit/tmp/ \ + --statedir /opt/unit/state/ \ + --tmpdir /opt/unit/tmp/ \ --user unit \ --group root