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

Make pcre2 default and not configurable

Browse source
This commit is contained in:
John Cai 2019-05-08 08:53:57 -07:00
parent 061f91568b
commit 936700a815
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
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