diff --git a/Dockerfile b/Dockerfile index 2a6de8c..743bb4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -63,17 +63,16 @@ RUN export DEBIAN_FRONTEND=noninteractive \ openssh-client \ openssl \ python3 \ - python3-distutils \ tini \ - && curl --silent --output /usr/share/keyrings/nginx-keyring.gpg \ + && curl --silent --output /etc/apt/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/ mantic unit" \ + && echo "deb [signed-by=/etc/apt/keyrings/nginx-keyring.gpg] https://packages.nginx.org/unit/ubuntu/ mantic unit" \ > /etc/apt/sources.list.d/unit.list \ && apt-get update -qq \ && apt-get install \ --yes -qq --no-install-recommends \ - unit=1.32.0-1~mantic \ - unit-python3.11=1.32.0-1~mantic \ + unit=1.32.1-1~mantic \ + unit-python3.12=1.32.1-1~mantic \ && rm -rf /var/lib/apt/lists/* COPY --from=builder /opt/netbox/venv /opt/netbox/venv diff --git a/build.sh b/build.sh index 352c1ce..0715969 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:23.10' + ${_GREEN}Default:${_CLEAR} 'ubuntu:24.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:23.10" + DOCKER_FROM="docker.io/ubuntu:24.04" fi ###