Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️ Upgrade Nginx to the latest version 1.23.2, and Debian to bullseye #163

Merged
merged 1 commit into from
Nov 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions docker-images/install-nginx-debian.sh
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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"; \
Expand All @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/python3.10.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-buster
FROM python:3.10-bullseye

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

Expand Down
2 changes: 1 addition & 1 deletion docker-images/python3.6.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.6-buster
FROM python:3.6-bullseye

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

Expand Down
2 changes: 1 addition & 1 deletion docker-images/python3.7.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.7-buster
FROM python:3.7-bullseye

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

Expand Down
2 changes: 1 addition & 1 deletion docker-images/python3.8.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8-buster
FROM python:3.8-bullseye

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

Expand Down
2 changes: 1 addition & 1 deletion docker-images/python3.9.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.9-buster
FROM python:3.9-bullseye

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

Expand Down