From cbba283710fcb4da3341647565d26b0898a352cd Mon Sep 17 00:00:00 2001 From: Bret Fisher Date: Sat, 27 Jan 2024 17:24:49 -0500 Subject: [PATCH] update nginx dockerfile-sample-1 --- dockerfile-sample-1/Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dockerfile-sample-1/Dockerfile b/dockerfile-sample-1/Dockerfile index 44fb131a..377e4e98 100644 --- a/dockerfile-sample-1/Dockerfile +++ b/dockerfile-sample-1/Dockerfile @@ -4,7 +4,7 @@ # to match the latest standards from docker hub... but it's doing the same thing as the video # describes -FROM debian:bullseye-slim +FROM debian:bookworm-slim # all images must have a FROM # usually from a minimal Linux distribution like debian or (even better) alpine # if you truly want to start with an empty container, use FROM scratch @@ -12,15 +12,15 @@ FROM debian:bullseye-slim LABEL maintainer="NGINX Docker Maintainers " # optional environment variable that's used in later lines and set as envvar when container is running -ENV NGINX_VERSION 1.23.4 -ENV NJS_VERSION 0.7.11 -ENV PKG_RELEASE 1~bullseye +ENV NGINX_VERSION 1.25.3 +ENV NJS_VERSION 0.8.2 +ENV PKG_RELEASE 1~bookworm RUN set -x \ # create nginx user/group first, to be consistent throughout docker variants - && addgroup --system --gid 101 nginx \ - && adduser --system --disabled-login --ingroup nginx --no-create-home --home /nonexistent --gecos "nginx user" --shell /bin/false --uid 101 nginx \ + && groupadd --system --gid 101 nginx \ + && useradd --system --gid nginx --no-create-home --home /nonexistent --comment "nginx user" --shell /bin/false --uid 101 nginx \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y gnupg1 ca-certificates \ && \ @@ -50,13 +50,13 @@ RUN set -x \ && case "$dpkgArch" in \ amd64|arm64) \ # arches officialy built by upstream - echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \ + echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \ && apt-get update \ ;; \ *) \ # we're on an architecture upstream doesn't officially build for # let's build binaries from the published source packages - echo "deb-src [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \ + echo "deb-src [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \ \ # new directory for storing sources and .deb files && tempDir="$(mktemp -d)" \