NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 18:12:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'jc-make-pcre-default' into 'master'

Browse source 
Make pcre2 default and not configurable

Closes #33

See merge request gitlab-org/gitlab-build-images!184
This commit is contained in:
Stan Hu 2019-05-09 02:04:58 +00:00
commit 22b63c169e
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Dockerfile.custom
View file

@ -15,15 +15,10 @@ ENV PATH $PATH:/usr/local/go/bin
# Git # Git
ARG GIT_VERSION 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_URL=https://www.kernel.org/pub/software/scm/git/git-${GIT_VERSION}.tar.gz
ARG GIT_DOWNLOAD_SHA256 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 RUN if [ -n "$GIT_VERSION" ]; then /scripts/install-git && git --version; fi
# Chrome # Chrome

4
scripts/install-pcre2
View file

@ -3,7 +3,9 @@
set -xeuo pipefail set -xeuo pipefail
IFS=$'\n\t' 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 \ && tar -xzf pcre2.tar.gz \
&& cd pcre2-${PCRE2_VERSION} \ && cd pcre2-${PCRE2_VERSION} \
&& chmod +x configure \ && chmod +x configure \