From 143bda7fb356e603f315fa7ef9aac28fe7b12f09 Mon Sep 17 00:00:00 2001
From: soulteary <soulteary@gmail.com>
Date: Sat, 19 Mar 2022 16:21:42 +0800
Subject: [PATCH] update: 1.21.6 with pcre2

---
 README.md             | 3 ++-
 src/.env              | 4 ++--
 src/Dockerfile.alpine | 2 +-
 src/Dockerfile.debian | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 3bdf385..8021cd5 100644
--- a/README.md
+++ b/README.md
@@ -4,12 +4,13 @@ Nginx Development Environment based on official docker image.
 
 ## Docker Image Name
 
-`docker pull soulteary/prebuilt-nginx-modules:base-1.21.5`
+`docker pull soulteary/prebuilt-nginx-modules:base-1.21.6`
 
 ## Nginx Versions
 
 Below are other available nginx versions.
 
+- 1.21.6
 - 1.21.5
 - 1.21.4
 - 1.21.3
diff --git a/src/.env b/src/.env
index a67f5e2..dd9c06f 100644
--- a/src/.env
+++ b/src/.env
@@ -1,2 +1,2 @@
-NGINX_VERSION=1.21.5
-NGINX_SHASUM=c63c01da947ac925ac682a43bf097762a2cc9287
+NGINX_VERSION=1.21.6
+NGINX_SHASUM=3e6d39a714f6716861286630a5f9df3044668d5a
diff --git a/src/Dockerfile.alpine b/src/Dockerfile.alpine
index bcf7226..44835f0 100644
--- a/src/Dockerfile.alpine
+++ b/src/Dockerfile.alpine
@@ -4,7 +4,7 @@ FROM nginx:${NGINX_VERSION}-alpine
 # RUN cat /etc/apk/repositories | sed -e "s/dl-cdn.alpinelinux.org/mirrors.aliyun.com/" | tee /etc/apk/repositories
 
 ARG NGINX_SHASUM=0dde53b5a948efc9dc852814186052e559d190ea
-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 && \
+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 && \
     mkdir -p /usr/src && cd /usr/src && \
     curl -L "http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz" -o nginx.tar.gz && \
     echo "$NGINX_SHASUM  nginx.tar.gz" | shasum -c && \
diff --git a/src/Dockerfile.debian b/src/Dockerfile.debian
index 798b7b1..f882ace 100644
--- a/src/Dockerfile.debian
+++ b/src/Dockerfile.debian
@@ -14,9 +14,9 @@ RUN apt-get update && \
     apt install -y wget curl && mkdir -p /usr/src
 
 RUN cd /usr/src && \
-    wget https://cfhcable.dl.sourceforge.net/project/pcre/pcre/8.44/pcre-8.44.tar.gz && \
-    tar zxvf pcre-8.44.tar.gz && \
-    cd pcre-8.44 && \
+    wget https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.39/pcre2-10.39.tar.gz && \
+    tar zxvf pcre2-10.39.tar.gz && \
+    cd pcre2-10.39 && \
     ./configure && make && make install
      
 RUN cd /usr/src && \