Skip to content

Commit c53ae2a

Browse files
authored
Merge pull request #805 from tobiasge/with-ubuntu
Using Ubuntu 22.04 because Debian has old packages
2 parents 8fbedf2 + 45e7f6a commit c53ae2a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ RUN export DEBIAN_FRONTEND=noninteractive \
5050
tini \
5151
&& curl -sL https://nginx.org/keys/nginx_signing.key \
5252
> /etc/apt/trusted.gpg.d/nginx.asc && \
53-
echo "deb https://packages.nginx.org/unit/debian/ bullseye unit" \
53+
echo "deb https://packages.nginx.org/unit/ubuntu/ jammy unit" \
5454
> /etc/apt/sources.list.d/unit.list \
5555
&& apt-get update -qq \
5656
&& apt-get install \
5757
--yes -qq --no-install-recommends \
58-
unit=1.27.0-1~bullseye \
59-
unit-python3.9=1.27.0-1~bullseye \
58+
unit=1.27.0-1~jammy \
59+
unit-python3.10=1.27.0-1~jammy \
6060
&& rm -rf /var/lib/apt/lists/*
6161

6262
COPY --from=builder /opt/netbox/venv /opt/netbox/venv

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ if [ "${1}x" == "x" ] || [ "${1}" == "--help" ] || [ "${1}" == "-h" ]; then
4343
echo " DOCKERFILE The name of Dockerfile to use."
4444
echo " Default: Dockerfile"
4545
echo " DOCKER_FROM The base image to use."
46-
echo " Default: 'debian:11-slim'"
46+
echo " Default: 'ubuntu:22.04'"
4747
echo " BUILDX_PLATFORMS"
4848
echo " Specifies the platform(s) to build the image for."
4949
echo " Example: 'linux/amd64,linux/arm64'"
@@ -182,7 +182,7 @@ fi
182182
# Determining the value for DOCKER_FROM
183183
###
184184
if [ -z "$DOCKER_FROM" ]; then
185-
DOCKER_FROM="debian:11-slim"
185+
DOCKER_FROM="ubuntu:22.04"
186186
fi
187187

188188
###

0 commit comments

Comments
 (0)