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.
This commit is contained in:
parent
8fbedf2886
commit
45e7f6a30c
@ -50,13 +50,13 @@ RUN export DEBIAN_FRONTEND=noninteractive \
|
|||||||
tini \
|
tini \
|
||||||
&& curl -sL https://nginx.org/keys/nginx_signing.key \
|
&& curl -sL https://nginx.org/keys/nginx_signing.key \
|
||||||
> /etc/apt/trusted.gpg.d/nginx.asc && \
|
> /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 \
|
> /etc/apt/sources.list.d/unit.list \
|
||||||
&& apt-get update -qq \
|
&& apt-get update -qq \
|
||||||
&& apt-get install \
|
&& apt-get install \
|
||||||
--yes -qq --no-install-recommends \
|
--yes -qq --no-install-recommends \
|
||||||
unit=1.27.0-1~bullseye \
|
unit=1.27.0-1~jammy \
|
||||||
unit-python3.9=1.27.0-1~bullseye \
|
unit-python3.10=1.27.0-1~jammy \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
COPY --from=builder /opt/netbox/venv /opt/netbox/venv
|
COPY --from=builder /opt/netbox/venv /opt/netbox/venv
|
||||||
|
4
build.sh
4
build.sh
@ -43,7 +43,7 @@ if [ "${1}x" == "x" ] || [ "${1}" == "--help" ] || [ "${1}" == "-h" ]; then
|
|||||||
echo " DOCKERFILE The name of Dockerfile to use."
|
echo " DOCKERFILE The name of Dockerfile to use."
|
||||||
echo " Default: Dockerfile"
|
echo " Default: Dockerfile"
|
||||||
echo " DOCKER_FROM The base image to use."
|
echo " DOCKER_FROM The base image to use."
|
||||||
echo " Default: 'debian:11-slim'"
|
echo " Default: 'ubuntu:22.04'"
|
||||||
echo " BUILDX_PLATFORMS"
|
echo " BUILDX_PLATFORMS"
|
||||||
echo " Specifies the platform(s) to build the image for."
|
echo " Specifies the platform(s) to build the image for."
|
||||||
echo " Example: 'linux/amd64,linux/arm64'"
|
echo " Example: 'linux/amd64,linux/arm64'"
|
||||||
@ -182,7 +182,7 @@ fi
|
|||||||
# Determining the value for DOCKER_FROM
|
# Determining the value for DOCKER_FROM
|
||||||
###
|
###
|
||||||
if [ -z "$DOCKER_FROM" ]; then
|
if [ -z "$DOCKER_FROM" ]; then
|
||||||
DOCKER_FROM="debian:11-slim"
|
DOCKER_FROM="ubuntu:22.04"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
###
|
###
|
||||||
|
Loading…
Reference in New Issue
Block a user