diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2021-08-16 13:49:38 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2021-08-16 13:49:38 -0400 |
| commit | d4416624fa6e74f7a07b7b2c021e049b315e5510 (patch) | |
| tree | bd5bd5fa2b363464611e5145a049b4ebdf7854fc /ci/docker | |
| parent | 5ad53ec762813522faac089576e62200e0045bdb (diff) | |
| download | libgit2-d4416624fa6e74f7a07b7b2c021e049b315e5510.tar.gz | |
ci: update centos builds
Diffstat (limited to 'ci/docker')
| -rw-r--r-- | ci/docker/centos7 | 24 | ||||
| -rw-r--r-- | ci/docker/centos8 | 17 |
2 files changed, 35 insertions, 6 deletions
diff --git a/ci/docker/centos7 b/ci/docker/centos7 index d1f499363..082b9e225 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 fe059a1b7..da0f2da94 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 |