From 936700a81522888fb0024d1a9b59a13861dd56c6 Mon Sep 17 00:00:00 2001 From: John Cai Date: Wed, 8 May 2019 08:53:57 -0700 Subject: [PATCH] Make pcre2 default and not configurable --- Dockerfile.custom | 9 ++------- scripts/install-pcre2 | 4 +++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Dockerfile.custom b/Dockerfile.custom index fe80922..a06ef6b 100644 --- a/Dockerfile.custom +++ b/Dockerfile.custom @@ -15,15 +15,10 @@ 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-pcre2 && pcre2-config --version; fi RUN if [ -n "$GIT_VERSION" ]; then /scripts/install-git && git --version; fi # Chrome diff --git a/scripts/install-pcre2 b/scripts/install-pcre2 index 10065be..865ac2a 100755 --- a/scripts/install-pcre2 +++ b/scripts/install-pcre2 @@ -3,7 +3,9 @@ set -xeuo pipefail IFS=$'\n\t' -curl -fsSL "$PCRE2_DOWNLOAD_URL" -o pcre2.tar.gz \ +PCRE2_VERSION=10.33 + +curl -fsSL https://ftp.pcre.org/pub/pcre/pcre2-${PCRE2_VERSION}.tar.gz -o pcre2.tar.gz \ && tar -xzf pcre2.tar.gz \ && cd pcre2-${PCRE2_VERSION} \ && chmod +x configure \