Skip to content

Commit

Permalink
update: 1.21.6 with pcre2
Browse files Browse the repository at this point in the history
  • Loading branch information
soulteary committed Mar 19, 2022
1 parent 4bd8a61 commit 143bda7
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
NGINX_VERSION=1.21.5
NGINX_SHASUM=c63c01da947ac925ac682a43bf097762a2cc9287
NGINX_VERSION=1.21.6
NGINX_SHASUM=3e6d39a714f6716861286630a5f9df3044668d5a
2 changes: 1 addition & 1 deletion src/Dockerfile.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
6 changes: 3 additions & 3 deletions src/Dockerfile.debian
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down

0 comments on commit 143bda7

Please sign in to comment.