Merge branch 'jc-add-pcre2' into 'master'

Install pcre2

See merge request gitlab-org/gitlab-build-images!183

Dockerfile.custom

@@ -15,6 +15,13 @@ ENV PATH $PATH:/usr/local/go/bin
 
 # Git
 ARG GIT_VERSION
+
+## pcre
+ARG PCRE2_VERSION=10.33
+ARG PCRE2_DOWNLOAD_URL=https://ftp.pcre.org/pub/pcre/pcre2-${PCRE2_VERSION}.tar.gz
+RUN if [ -n "$GIT_VERSION" ]; then /scripts/install-pcre2 && pcre2-config --version; fi
+
+## git
 ARG GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git/git-${GIT_VERSION}.tar.gz
 ARG GIT_DOWNLOAD_SHA256
 RUN if [ -n "$GIT_VERSION" ]; then /scripts/install-git && git --version; fi

scripts/install-git

@@ -9,7 +9,7 @@ mkdir build \
 	&& tar -C build -xzf git.tar.gz \
 	&& cd build/git-$GIT_VERSION \
 	&& chmod +x configure \
-	&& USE_LIBPCRE=YesPlease ./configure --with-libpcre \
+	&& ./configure --with-libpcre \
 	&& make all \
 	&& make install PREFIX=/usr/local \
 	&& cd ../.. \

scripts/install-pcre2

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -xeuo pipefail
+IFS=$'\n\t'
+
+curl -fsSL "$PCRE2_DOWNLOAD_URL" -o pcre2.tar.gz \
+  && tar -xzf pcre2.tar.gz \
+  && cd pcre2-${PCRE2_VERSION} \
+  && chmod +x configure \
+  && ./configure --prefix=/usr --enable-jit \
+  && make \
+  && make install \
+  && cd ../ \
+  && rm -rf pcre2-${PCRE2_VERSION} \
+  && rm pcre2.tar.gz