Skip to content

Commit 143bda7

Browse files
committed
update: 1.21.6 with pcre2
1 parent 4bd8a61 commit 143bda7

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ Nginx Development Environment based on official docker image.
44

55
## Docker Image Name
66

7-
`docker pull soulteary/prebuilt-nginx-modules:base-1.21.5`
7+
`docker pull soulteary/prebuilt-nginx-modules:base-1.21.6`
88

99
## Nginx Versions
1010

1111
Below are other available nginx versions.
1212

13+
- 1.21.6
1314
- 1.21.5
1415
- 1.21.4
1516
- 1.21.3

src/.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
NGINX_VERSION=1.21.5
2-
NGINX_SHASUM=c63c01da947ac925ac682a43bf097762a2cc9287
1+
NGINX_VERSION=1.21.6
2+
NGINX_SHASUM=3e6d39a714f6716861286630a5f9df3044668d5a

src/Dockerfile.alpine

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM nginx:${NGINX_VERSION}-alpine
44
# RUN cat /etc/apk/repositories | sed -e "s/dl-cdn.alpinelinux.org/mirrors.aliyun.com/" | tee /etc/apk/repositories
55

66
ARG NGINX_SHASUM=0dde53b5a948efc9dc852814186052e559d190ea
7-
RUN apk add --no-cache --virtual .build-deps gcc libc-dev make openssl-dev pcre-dev zlib-dev linux-headers libxslt-dev gd-dev geoip-dev perl-dev libedit-dev mercurial bash alpine-sdk findutils && \
7+
RUN apk add --no-cache --virtual .build-deps gcc libc-dev make openssl-dev pcre2-dev zlib-dev linux-headers libxslt-dev gd-dev geoip-dev perl-dev libedit-dev mercurial bash alpine-sdk findutils && \
88
mkdir -p /usr/src && cd /usr/src && \
99
curl -L "http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz" -o nginx.tar.gz && \
1010
echo "$NGINX_SHASUM nginx.tar.gz" | shasum -c && \

src/Dockerfile.debian

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ RUN apt-get update && \
1414
apt install -y wget curl && mkdir -p /usr/src
1515

1616
RUN cd /usr/src && \
17-
wget https://cfhcable.dl.sourceforge.net/project/pcre/pcre/8.44/pcre-8.44.tar.gz && \
18-
tar zxvf pcre-8.44.tar.gz && \
19-
cd pcre-8.44 && \
17+
wget https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.39/pcre2-10.39.tar.gz && \
18+
tar zxvf pcre2-10.39.tar.gz && \
19+
cd pcre2-10.39 && \
2020
./configure && make && make install
2121

2222
RUN cd /usr/src && \

0 commit comments

Comments
 (0)