Skip to content

Commit a3db7f3

Browse files
authored
⬆️ Upgrade Nginx to latest, 1.29.3, and Debian to latest, Trixie (#248)
1 parent e2b9958 commit a3db7f3

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

docker-images/install-nginx-debian.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#! /usr/bin/env bash
22

33
# From official Nginx Docker image, as a script to re-use it, removing internal comments
4-
# Ref: https://github.com/nginx/docker-nginx/blob/7f1d49f6f222f7e588a9066fd53a0ce43c3466a5/mainline/debian/Dockerfile
4+
# Ref: https://github.com/nginx/docker-nginx/blob/e4d5453581d9d3618f77c4aeccf2e6171a1cd6ff/mainline/debian/Dockerfile
55
# Override group id from 101 to 102 as the original clashes with build-deps _ssh gid 101
66

77

88
# Standard set up Nginx
9-
export NGINX_VERSION=1.27.5
10-
export NJS_VERSION=0.8.10
11-
export NJS_RELEASE=1~bookworm
12-
export PKG_RELEASE=1~bookworm
13-
export DYNPKG_RELEASE=1~bookworm
9+
export NGINX_VERSION=1.29.3
10+
export NJS_VERSION=0.9.4
11+
export NJS_RELEASE=1~trixie
12+
export PKG_RELEASE=1~trixie
13+
export DYNPKG_RELEASE=1~trixie
1414

1515
set -x \
1616
&& groupadd --system --gid 102 nginx \
@@ -28,11 +28,11 @@ set -x \
2828
pgp.mit.edu \
2929
; do \
3030
echo "Fetching GPG key $NGINX_GPGKEY from $server"; \
31-
gpg1 --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
31+
gpg1 --batch --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
3232
done; \
3333
test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
3434
done; \
35-
gpg1 --export "$NGINX_GPGKEYS" > "$NGINX_GPGKEY_PATH" ; \
35+
gpg1 --batch --export $NGINX_GPGKEYS > "$NGINX_GPGKEY_PATH" ; \
3636
rm -rf "$GNUPGHOME"; \
3737
apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
3838
&& dpkgArch="$(dpkg --print-architecture)" \
@@ -45,7 +45,7 @@ set -x \
4545
" \
4646
&& case "$dpkgArch" in \
4747
amd64|arm64) \
48-
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list \
48+
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ trixie nginx" >> /etc/apt/sources.list.d/nginx.list \
4949
&& apt-get update \
5050
;; \
5151
*) \
@@ -68,7 +68,7 @@ set -x \
6868
&& REVISION="${NGINX_VERSION}-${PKG_RELEASE}" \
6969
&& REVISION=${REVISION%~*} \
7070
&& curl -f -L -O https://github.com/nginx/pkg-oss/archive/${REVISION}.tar.gz \
71-
&& PKGOSSCHECKSUM="c773d98b567bd585c17f55702bf3e4c7d82b676bfbde395270e90a704dca3c758dfe0380b3f01770542b4fd9bed1f1149af4ce28bfc54a27a96df6b700ac1745 *${REVISION}.tar.gz" \
71+
&& PKGOSSCHECKSUM="249858446828ace0c81ea3e057135aa368f3dab83430cf867bb9fc32598948f29c4bd50908491da704536af1106aa87553f6a76cc126c6833dc9b14dd00564b8 *${REVISION}.tar.gz" \
7272
&& if [ "$(openssl sha512 -r ${REVISION}.tar.gz)" = "$PKGOSSCHECKSUM" ]; then \
7373
echo "pkg-oss tarball checksum verification succeeded!"; \
7474
else \

docker-images/python3.10.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.10-bookworm
1+
FROM python:3.10-trixie
22

33
LABEL maintainer="Sebastian Ramirez <[email protected]>"
44

docker-images/python3.11.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.11-bookworm
1+
FROM python:3.11-trixie
22

33
LABEL maintainer="Sebastian Ramirez <[email protected]>"
44

docker-images/python3.12.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.12-bookworm
1+
FROM python:3.12-trixie
22

33
LABEL maintainer="Sebastian Ramirez <[email protected]>"
44

docker-images/python3.9.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.9-bookworm
1+
FROM python:3.9-trixie
22

33
LABEL maintainer="Sebastian Ramirez <[email protected]>"
44

0 commit comments

Comments
 (0)