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 75f20bc Install tcl-dev and cleanup build_h3_tools repositories. (#22)
75f20bc is described below
commit 75f20bc1e4e57c64020cf7cdfeec67b919522b93
Author: Brian Neradt <[email protected]>
AuthorDate: Wed Jun 30 18:12:14 2021 -0500
Install tcl-dev and cleanup build_h3_tools repositories. (#22)
---
docker/centos/Dockerfile | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile
index 3956317..d4a47c2 100644
--- a/docker/centos/Dockerfile
+++ b/docker/centos/Dockerfile
@@ -13,7 +13,7 @@ RUN yum -y install epel-release dnf-plugins-core; yum
config-manager --set-enabl
yum -y install openssl-devel expat-devel pcre-devel libcap-devel
hwloc-devel libunwind-devel \
xz-devel libcurl-devel ncurses-devel jemalloc-devel GeoIP-devel
luajit-devel brotli-devel \
ImageMagick-devel ImageMagick-c++-devel hiredis-devel zlib-devel
libmaxminddb-devel \
- perl-ExtUtils-MakeMaker perl-Digest-SHA perl-URI curl; \
+ perl-ExtUtils-MakeMaker perl-Digest-SHA perl-URI curl tcl-devel; \
# autest stuff
yum -y install python3 httpd-tools procps-ng nmap-ncat python3-pip \
python3-gunicorn python3-requests python3-devel python3-psutil telnet
golang;
@@ -28,8 +28,16 @@ RUN yum install -y python38-devel
RUN alternatives --set python /usr/bin/python3.8
RUN yum -y install libev-devel jemalloc-devel libxml2-devel \
c-ares-devel libevent-devel jansson-devel zlib-devel systemd-devel
-COPY /build_h3_tools.sh /var/tmp/build_h3_tools.sh
-RUN bash /var/tmp/build_h3_tools.sh
+
+ARG h3_tools_dir=/var/tmp/h3_tools_tmp
+RUN mkdir -p ${h3_tools_dir}
+WORKDIR ${h3_tools_dir}
+COPY /build_h3_tools.sh ${h3_tools_dir}/build_h3_tools.sh
+# This will install OpenSSL QUIC and related tools in /opt.
+RUN bash ${h3_tools_dir}/build_h3_tools.sh
+WORKDIR /root
+RUN rm -rf ${h3_tools_dir}
+
# 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
