This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git
The following commit(s) were added to refs/heads/main by this push:
new b10844d rockylinux:8 - use system cmake (#204)
b10844d is described below
commit b10844db481f72a239046ccb9d499d739a385dcf
Author: Brian Neradt <[email protected]>
AuthorDate: Wed Aug 16 21:17:06 2023 -0500
rockylinux:8 - use system cmake (#204)
We decided that we will support the system cmake for rockylinux:8,
version 3.20. This reverts the manual update of cmake to the more recent
3.26 version to instead use the system 3.20 version so we test with that
in CI.
---
docker/rockylinux8/Dockerfile | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/docker/rockylinux8/Dockerfile b/docker/rockylinux8/Dockerfile
index f102f04..bd07d48 100644
--- a/docker/rockylinux8/Dockerfile
+++ b/docker/rockylinux8/Dockerfile
@@ -13,7 +13,7 @@ RUN <<EOF
# Build tools.
yum -y install \
- ccache make pkgconfig bison flex gcc-c++ clang \
+ ccache make pkgconfig bison flex gcc-c++ clang cmake \
autoconf automake libtool \
gcc-toolset-11 gcc-toolset-11-libasan-devel
@@ -51,16 +51,6 @@ RUN <<EOF
EOF
ARG PATH=/opt/bin:$PATH
-# Install a recent cmake.
-RUN yum remove -y cmake
-RUN <<EOF
- set -e
- wget
https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-linux-x86_64.sh
- chmod +x cmake-3.26.3-linux-x86_64.sh
- bash ./cmake-3.26.3-linux-x86_64.sh --skip-license --prefix=/opt
- rm -f cmake-3.26.3-linux-x86_64.sh
-EOF
-
# Install the latest ninja, which has some performance improvements over the
# older system version.
RUN <<EOF
