From 81f54f7135fd6e6b04d92c8e1dbee093cf0a499e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 26 Jan 2018 17:22:50 +0100 Subject: [PATCH] Replace re2 manual install with libre2-dev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since we are using xenial now. It’s also possible to cleanup this build instruction. Signed-off-by: solidnerd --- Dockerfile | 1 + assets/build/install.sh | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9509b4cb..876b3e96 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,6 +43,7 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E60 libmysqlclient20 libpq5 zlib1g libyaml-0-2 libssl1.0.0 \ libgdbm3 libreadline6 libncurses5 libffi6 \ libxml2 libxslt1.1 libcurl3 libicu55 \ + libre2-dev \ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ && locale-gen en_US.UTF-8 \ && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \ diff --git a/assets/build/install.sh b/assets/build/install.sh index 76396d59..0c5e7cda 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -29,19 +29,6 @@ exec_as_git() { apt-get update DEBIAN_FRONTEND=noninteractive apt-get install -y ${BUILD_DEPENDENCIES} -# Install RE2 library wich became dependencie since 9.3.8 version -# https://gitlab.com/gitlab-org/gitlab-ce/issues/35342 -DEBIAN_FRONTEND=noninteractive apt-get install -y checkinstall -cd /tmp -git clone https://github.com/google/re2.git -cd re2/ && make && make test -checkinstall -D --install=no -y --pkgname=re2 --pkgversion=1-current -dpkg -i re2_1-current-1_amd64.deb -ldconfig -cd - -rm -rf /tmp/re2 -DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove checkinstall - # PaX-mark ruby # Applying the mark late here does make the build usable on PaX kernels, but # still the build itself must be executed on a non-PaX kernel. It's done here