From b23f923948fadfd1e97ac040e5d254bb821850f2 Mon Sep 17 00:00:00 2001
From: Ricard Bejarano <ricard@bejarano.network>
Date: Tue, 26 Jan 2021 20:07:09 +0100
Subject: [PATCH] removed download dependency on pcre download

---
 Dockerfile | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ec4f064..5630345 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,26 +6,20 @@ ARG CHECKSUM="b11195a02b1d3285ddf2987e02c6b6d28df41bb1b1dd25f33542848ef4fc33b5"
 ARG OPENSSL_VERSION="1.1.1i"
 ARG OPENSSL_CHECKSUM="e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242"
 
-ARG PCRE_VERSION="8.44"
-ARG PCRE_CHECKSUM="aecafd4af3bd0f3935721af77b889d9024b2e01d96b58471bd91a3063fb47728"
-
 ARG ZLIB_VERSION="1.2.11"
 ARG ZLIB_CHECKSUM="c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"
 
 ADD https://nginx.org/download/nginx-$VERSION.tar.gz /tmp/nginx.tar.gz
 ADD https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz /tmp/openssl.tar.gz
-ADD https://ftp.pcre.org/pub/pcre/pcre-$PCRE_VERSION.tar.gz /tmp/pcre.tar.gz
 ADD https://zlib.net/zlib-$ZLIB_VERSION.tar.gz /tmp/zlib.tar.gz
 
-RUN [ "$(sha256sum /tmp/openssl.tar.gz | awk '{print $1}')" = "$OPENSSL_CHECKSUM" ] && \
-    [ "$(sha256sum /tmp/pcre.tar.gz | awk '{print $1}')" = "$PCRE_CHECKSUM" ] && \
+RUN [ "$(sha256sum /tmp/nginx.tar.gz | awk '{print $1}')" = "$CHECKSUM" ] && \
+    [ "$(sha256sum /tmp/openssl.tar.gz | awk '{print $1}')" = "$OPENSSL_CHECKSUM" ] && \
     [ "$(sha256sum /tmp/zlib.tar.gz | awk '{print $1}')" = "$ZLIB_CHECKSUM" ] && \
-    [ "$(sha256sum /tmp/nginx.tar.gz | awk '{print $1}')" = "$CHECKSUM" ] && \
-    apk add build-base ca-certificates gcc linux-headers perl && \
-    tar -C /tmp -xf /tmp/openssl.tar.gz && \
-    tar -C /tmp -xf /tmp/pcre.tar.gz && \
-    tar -C /tmp -xf /tmp/zlib.tar.gz && \
+    apk add build-base ca-certificates gcc linux-headers pcre-dev perl && \
     tar -C /tmp -xf /tmp/nginx.tar.gz && \
+    tar -C /tmp -xf /tmp/openssl.tar.gz && \
+    tar -C /tmp -xf /tmp/zlib.tar.gz && \
     cd /tmp/nginx-$VERSION && \
       ./configure \
         --with-cc-opt="-static" \
@@ -73,9 +67,8 @@ RUN [ "$(sha256sum /tmp/openssl.tar.gz | awk '{print $1}')" = "$OPENSSL_CHECKSUM
         # --with-stream_geoip_module \
         --with-stream_ssl_preread_module \
         --with-compat \
-        --with-pcre="/tmp/pcre-$PCRE_VERSION" \
-        --with-zlib="/tmp/zlib-$ZLIB_VERSION" \
-        --with-openssl="/tmp/openssl-$OPENSSL_VERSION" && \
+        --with-openssl="/tmp/openssl-$OPENSSL_VERSION" \
+        --with-zlib="/tmp/zlib-$ZLIB_VERSION" && \
       make
 
 RUN mkdir -p /rootfs/bin && \