Commit d4416624fa6e74f7a07b7b2c021e049b315e5510
2021-08-16T13:49:38
ci: update centos builds
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 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78
diff --git a/ci/docker/centos7 b/ci/docker/centos7
index d1f4993..082b9e2 100644
--- a/ci/docker/centos7
+++ b/ci/docker/centos7
@@ -2,6 +2,7 @@ ARG BASE=centos:7
FROM ${BASE} AS yum
RUN yum install -y \
which \
+ bzip2 \
git \
libarchive \
gcc \
@@ -20,17 +21,32 @@ RUN cd /tmp && \
cd libssh2-1.8.0 && \
./configure && \
make && \
- make install
+ make install && \
+ cd .. && \
+ rm -rf libssh-1.8.0
-FROM libssh2 AS cmake
+FROM libssh2 AS valgrind
+RUN cd /tmp && \
+ curl --insecure --location --silent --show-error https://sourceware.org/pub/valgrind/valgrind-3.15.0.tar.bz2 | \
+ tar -xj && \
+ cd valgrind-3.15.0 && \
+ ./configure && \
+ make MAKEFLAGS="-j -l$(grep -c ^processor /proc/cpuinfo)" && \
+ make install && \
+ cd .. && \
+ rm -rf valgrind-3.15.0
+
+FROM valgrind AS cmake
RUN cd /tmp && \
curl -L https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1.tar.gz | tar -xz && \
cd cmake-3.21.1 && \
./configure && \
make && \
- make install
+ make install && \
+ cd .. && \
+ rm -rf cmake-3.21.1
-FROM libssh2 AS adduser
+FROM cmake AS adduser
RUN useradd --shell /bin/bash libgit2 --create-home
FROM adduser AS configure
diff --git a/ci/docker/centos8 b/ci/docker/centos8
index fe059a1..da0f2da 100644
--- a/ci/docker/centos8
+++ b/ci/docker/centos8
@@ -22,9 +22,22 @@ RUN cd /tmp && \
cd libssh2-1.8.0 && \
./configure && \
make && \
- make install
+ make install && \
+ cd .. && \
+ rm -rf libssh2-1.8.0
-FROM libssh2 AS adduser
+FROM libssh2 AS valgrind
+RUN cd /tmp && \
+ curl --insecure --location --silent --show-error https://sourceware.org/pub/valgrind/valgrind-3.15.0.tar.bz2 | \
+ tar -xj && \
+ cd valgrind-3.15.0 && \
+ CC=clang-10 ./configure && \
+ make MAKEFLAGS="-j -l$(grep -c ^processor /proc/cpuinfo)" && \
+ make install && \
+ cd .. && \
+ rm -rf valgrind-3.15.0
+
+FROM valgrind AS adduser
RUN useradd --shell /bin/bash libgit2 --create-home
FROM adduser AS configure