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 2ba716e Install a recent cmake in rockylinux:8 (#158)
2ba716e is described below
commit 2ba716e287e5541adf68d44c770dc881a01f3211
Author: Brian Neradt <brian.ner...@gmail.com>
AuthorDate: Wed May 3 13:36:25 2023 -0500
Install a recent cmake in rockylinux:8 (#158)
---
docker/rockylinux8/Dockerfile | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/docker/rockylinux8/Dockerfile b/docker/rockylinux8/Dockerfile
index f52500b..1f3cf80 100644
--- a/docker/rockylinux8/Dockerfile
+++ b/docker/rockylinux8/Dockerfile
@@ -22,8 +22,19 @@ RUN pip3 install --upgrade pip
RUN pip3 install pipenv httpbin
RUN yum -y install gcc-toolset-11 gcc-toolset-11-libasan-devel
+# We put our custom packages in /opt.
+RUN echo 'PATH=/opt/bin:$PATH' | tee -a /etc/profile.d/opt_bin.sh
+ARG PATH=/opt/bin:$PATH
+
+# Install a recent cmake.
+RUN yum remove -y cmake
+RUN \
+ 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
+
# Install openssl-quic
-RUN yum install -y python38-devel cmake cargo
+RUN yum install -y python38-devel cargo
RUN alternatives --set python /usr/bin/python3.8
RUN yum -y install libev-devel jemalloc-devel libxml2-devel \
@@ -39,9 +50,6 @@ COPY /build_h3_tools.sh ${h3_tools_dir}/build_h3_tools.sh
RUN bash ${h3_tools_dir}/build_h3_tools.sh
WORKDIR /root
-# Make sure we pick up this built version of curl, which is in /opt/bin.
-RUN echo 'PATH=/opt/bin:$PATH' | tee -a /etc/profile.d/curl_http3.sh
-
# Install some of our needed go applications.
RUN echo 'export PATH=$PATH:/opt/go/bin' | tee -a /etc/profile.d/go.sh
RUN echo 'export GOBIN=/opt/go/bin' | tee -a /etc/profile.d/go.sh
