From b0e5d6ac459ea9d6eff117233038c0868ce9c8de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Fri, 25 Nov 2022 15:47:00 +0100 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrade=20installation=20o?= =?UTF-8?q?f=20Nginx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-images/install-nginx-debian.sh | 16 +++++++--------- docker-images/python3.10.dockerfile | 2 +- docker-images/python3.6.dockerfile | 2 +- docker-images/python3.7.dockerfile | 2 +- docker-images/python3.8.dockerfile | 2 +- docker-images/python3.9.dockerfile | 2 +- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/docker-images/install-nginx-debian.sh b/docker-images/install-nginx-debian.sh index f546b3f..0b1715d 100644 --- a/docker-images/install-nginx-debian.sh +++ b/docker-images/install-nginx-debian.sh @@ -1,12 +1,12 @@ #! /usr/bin/env bash # From official Nginx Docker image, as a script to re-use it, removing internal comments -# Ref: https://github.com/nginxinc/docker-nginx/blob/f958fbacada447737319e979db45a1da49123142/mainline/debian/Dockerfile +# Ref: https://github.com/nginxinc/docker-nginx/blob/fef51235521d1cdf8b05d8cb1378a526d2abf421/mainline/debian/Dockerfile # Standard set up Nginx -export NGINX_VERSION=1.21.6 -export NJS_VERSION=0.7.3 -export PKG_RELEASE=1~buster +export NGINX_VERSION=1.23.2 +export NJS_VERSION=0.7.7 +export PKG_RELEASE=1~bullseye set -x \ && apt-get update \ @@ -15,9 +15,7 @@ set -x \ NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \ found=''; \ for server in \ - ha.pool.sks-keyservers.net \ hkp://keyserver.ubuntu.com:80 \ - hkp://p80.pool.sks-keyservers.net:80 \ pgp.mit.edu \ ; do \ echo "Fetching GPG key $NGINX_GPGKEY from $server"; \ @@ -34,12 +32,12 @@ set -x \ nginx-module-njs=${NGINX_VERSION}+${NJS_VERSION}-${PKG_RELEASE} \ " \ && case "$dpkgArch" in \ - amd64|i386|arm64) \ - echo "deb https://nginx.org/packages/mainline/debian/ buster nginx" >> /etc/apt/sources.list.d/nginx.list \ + amd64|arm64) \ + echo "deb https://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \ && apt-get update \ ;; \ *) \ - echo "deb-src https://nginx.org/packages/mainline/debian/ buster nginx" >> /etc/apt/sources.list.d/nginx.list \ + echo "deb-src https://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \ \ && tempDir="$(mktemp -d)" \ && chmod 777 "$tempDir" \ diff --git a/docker-images/python3.10.dockerfile b/docker-images/python3.10.dockerfile index 7f619aa..3fea692 100644 --- a/docker-images/python3.10.dockerfile +++ b/docker-images/python3.10.dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-buster +FROM python:3.10-bullseye LABEL maintainer="Sebastian Ramirez " diff --git a/docker-images/python3.6.dockerfile b/docker-images/python3.6.dockerfile index c1bcddc..465fb87 100644 --- a/docker-images/python3.6.dockerfile +++ b/docker-images/python3.6.dockerfile @@ -1,4 +1,4 @@ -FROM python:3.6-buster +FROM python:3.6-bullseye LABEL maintainer="Sebastian Ramirez " diff --git a/docker-images/python3.7.dockerfile b/docker-images/python3.7.dockerfile index 11b56ae..d74d215 100644 --- a/docker-images/python3.7.dockerfile +++ b/docker-images/python3.7.dockerfile @@ -1,4 +1,4 @@ -FROM python:3.7-buster +FROM python:3.7-bullseye LABEL maintainer="Sebastian Ramirez " diff --git a/docker-images/python3.8.dockerfile b/docker-images/python3.8.dockerfile index 0b95ed9..23b1c0b 100644 --- a/docker-images/python3.8.dockerfile +++ b/docker-images/python3.8.dockerfile @@ -1,4 +1,4 @@ -FROM python:3.8-buster +FROM python:3.8-bullseye LABEL maintainer="Sebastian Ramirez " diff --git a/docker-images/python3.9.dockerfile b/docker-images/python3.9.dockerfile index 64c8493..0c2f66b 100644 --- a/docker-images/python3.9.dockerfile +++ b/docker-images/python3.9.dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9-buster +FROM python:3.9-bullseye LABEL maintainer="Sebastian Ramirez "