From 45e7f6a30c2187d53da79b1580d606ae0101d5d4 Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Thu, 14 Jul 2022 22:54:28 +0200 Subject: [PATCH] Using Ubuntu 22.04 because Debian has old packages With Debian the Quay.io security checker found several issues in the image. With Ubuntu we have never versions of all packages and therefore less (or no) issues. --- Dockerfile | 6 +++--- build.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index ba8863559..cb9050afc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,13 +50,13 @@ RUN export DEBIAN_FRONTEND=noninteractive \ tini \ && curl -sL https://nginx.org/keys/nginx_signing.key \ > /etc/apt/trusted.gpg.d/nginx.asc && \ - echo "deb https://packages.nginx.org/unit/debian/ bullseye unit" \ + echo "deb https://packages.nginx.org/unit/ubuntu/ jammy unit" \ > /etc/apt/sources.list.d/unit.list \ && apt-get update -qq \ && apt-get install \ --yes -qq --no-install-recommends \ - unit=1.27.0-1~bullseye \ - unit-python3.9=1.27.0-1~bullseye \ + unit=1.27.0-1~jammy \ + unit-python3.10=1.27.0-1~jammy \ && rm -rf /var/lib/apt/lists/* COPY --from=builder /opt/netbox/venv /opt/netbox/venv diff --git a/build.sh b/build.sh index 18a5645f9..169568e03 100755 --- a/build.sh +++ b/build.sh @@ -43,7 +43,7 @@ if [ "${1}x" == "x" ] || [ "${1}" == "--help" ] || [ "${1}" == "-h" ]; then echo " DOCKERFILE The name of Dockerfile to use." echo " Default: Dockerfile" echo " DOCKER_FROM The base image to use." - echo " Default: 'debian:11-slim'" + echo " Default: 'ubuntu:22.04'" echo " BUILDX_PLATFORMS" echo " Specifies the platform(s) to build the image for." echo " Example: 'linux/amd64,linux/arm64'" @@ -182,7 +182,7 @@ fi # Determining the value for DOCKER_FROM ### if [ -z "$DOCKER_FROM" ]; then - DOCKER_FROM="debian:11-slim" + DOCKER_FROM="ubuntu:22.04" fi ###