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.

Sign up for GitHub

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

Jump to bottom

update NGINX, NGINX Plus, NJS, and NGINX XSLT module to newest versions #184

Merged
merged 5 commits into from
Oct 25, 2023
Merged

update NGINX, NGINX Plus, NJS, and NGINX XSLT module to newest versions #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eabd386
fix: fixes #182 update NGINX, NGINX Plus, NJS, and NGINX XSLT module …
4141done Oct 25, 2023
1421c0c
correct njs version tag for linux package
4141done Oct 25, 2023
12a46a5
corect njs tag again
4141done Oct 25, 2023
98c8f2d
correct libpcre package for bookworm in njs latest container
4141done Oct 25, 2023
a665f28
update plus images to use debian bookworm
4141done Oct 25, 2023
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
10 changes: 5 additions & 5 deletions Dockerfile.buildkit.plus
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM debian:bullseye-slim
FROM debian:bookworm-slim

ENV NGINX_PLUS_VERSION 29-1
ENV NGINX_VERSION 1.23.4
ENV NJS_VERSION 29+0.7.12-1
ENV XSLT_VERSION 29-1
ENV NGINX_PLUS_VERSION 30-2
ENV NGINX_VERSION 1.25.1
ENV NJS_VERSION 30+0.8.0-1
ENV XSLT_VERSION 30-1

ENV PROXY_CACHE_MAX_SIZE "10g"
ENV PROXY_CACHE_INACTIVE "60m"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.latest-njs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM nginx-s3-gateway
RUN set -eux \
export DEBIAN_FRONTEND=noninteractive; \
apt-get update -qq; \
apt-get install --no-install-recommends --no-install-suggests --yes make gcc libc6-dev curl expect libpcre2-dev libpcre3-dev libedit-dev libreadline-dev libssl-dev libpcre2-posix2 libxml2-dev libxslt1-dev zlib1g-dev; \
apt-get install --no-install-recommends --no-install-suggests --yes make gcc libc6-dev curl expect libpcre2-dev libpcre3-dev libedit-dev libreadline-dev libssl-dev libpcre2-posix3 libxml2-dev libxslt1-dev zlib1g-dev; \
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Annotation:
This change was necessary due to the libpcre2-posix2 library being unavailable in debian bookworm on which the official nginx image is based.

mkdir -p /tmp/nginx /tmp/njs-latest; \
curl --retry 6 --location "https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz" \
| gunzip | tar --extract --strip-components=1 --directory /tmp/nginx; \
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.oss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM nginx:1.24.0
FROM nginx:1.25.3

ENV NGINX_VERSION "1.24.0"
ENV NJS_VERSION 0.7.12
ENV NGINX_VERSION "1.25.3"
ENV NJS_VERSION "0.8.2"

ENV PROXY_CACHE_MAX_SIZE "10g"
ENV PROXY_CACHE_INACTIVE "60m"
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile.plus
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM debian:bullseye-slim
FROM debian:bookworm-slim

ENV NGINX_PLUS_VERSION 29-1
ENV NGINX_VERSION 1.23.4
ENV NJS_VERSION 29+0.7.12-1
ENV XSLT_VERSION 29-1
ENV NGINX_PLUS_VERSION 30-2
ENV NGINX_VERSION 1.25.1
ENV NJS_VERSION 30+0.8.0-1
ENV XSLT_VERSION 30-1

ENV PROXY_CACHE_MAX_SIZE "10g"
ENV PROXY_CACHE_INACTIVE "60m"
Expand Down
Loading