Commit c64b7aaa6ec8ba1c3d7e257a37ee21f982c93086
2019-11-23T20:38:30
ci: build our own valgrind The valgrind in the PPA is broken and ignores `--exit-errorcode`. Build and install our own.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45
diff --git a/azure-pipelines/docker/xenial b/azure-pipelines/docker/xenial
index 855ad0d..19b9fab 100644
--- a/azure-pipelines/docker/xenial
+++ b/azure-pipelines/docker/xenial
@@ -1,9 +1,8 @@
ARG BASE
FROM $BASE AS apt
-RUN echo 'deb http://ppa.launchpad.net/hola-launchpad/valgrind/ubuntu xenial main' >/etc/apt/sources.list.d/valgrind.list && \
- apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8A0303A7544D59A08EBD1D621BCFD9273D292CF6 && \
- apt-get update && \
+RUN apt-get update && \
apt-get install -y --no-install-recommends \
+ bzip2 \
clang \
cmake \
curl \
@@ -15,6 +14,7 @@ RUN echo 'deb http://ppa.launchpad.net/hola-launchpad/valgrind/ubuntu xenial mai
libpcre3-dev \
libssl-dev \
libz-dev \
+ make \
ninja-build \
openjdk-8-jre-headless \
openssh-server \
@@ -46,7 +46,19 @@ RUN cd /tmp && \
cd .. && \
rm -rf libssh2-1.8.2
-FROM libssh2 AS configure
+FROM libssh2 AS valgrind
+RUN cd /tmp && \
+ curl -LO https://sourceware.org/pub/valgrind/valgrind-3.15.0.tar.bz2 && \
+ tar -xf valgrind-3.15.0.tar.bz2 && \
+ rm -f valgrind-3.15.0.tar.bz2 && \
+ cd valgrind-3.15.0 && \
+ ./configure && \
+ make && \
+ make install && \
+ cd .. && \
+ rm -rf valgrind-3.15.0
+
+FROM valgrind AS configure
COPY entrypoint.sh /usr/local/bin/entrypoint.sh
RUN chmod a+x /usr/local/bin/entrypoint.sh
RUN mkdir /var/run/sshd