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 4dde2d7 Set libswoc version explicitly (#369)
4dde2d7 is described below
commit 4dde2d75ca6e3847c1b5b771dad5b50c739c6507
Author: Brian Neradt <[email protected]>
AuthorDate: Wed Jan 15 09:52:26 2025 -0600
Set libswoc version explicitly (#369)
We cannot merge ATS libswoc update until we update rocky. So explicitly
set libswoc versions installed in rocky.
---
docker/rockylinux8/Dockerfile | 3 +--
docker/rockylinux9/Dockerfile | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/docker/rockylinux8/Dockerfile b/docker/rockylinux8/Dockerfile
index d80abd9..55250ba 100644
--- a/docker/rockylinux8/Dockerfile
+++ b/docker/rockylinux8/Dockerfile
@@ -242,8 +242,7 @@ RUN <<EOF
cd /root/
mkdir libswoc
cd libswoc
- wget -O CMakeLists.txt
https://raw.githubusercontent.com/apache/trafficserver/master/lib/swoc/CMakeLists.txt
- swoc_version=$(awk '/LIBSWOC_VERSION/ {print $NF; exit}' CMakeLists.txt | tr
-d '")')
+ swoc_version=1.5.13
# Now, checkout that version and install libswoc in /opt/libswoc
git clone https://github.com/apache/trafficserver-libswoc.git
diff --git a/docker/rockylinux9/Dockerfile b/docker/rockylinux9/Dockerfile
index 1b8c4f4..b33a9aa 100644
--- a/docker/rockylinux9/Dockerfile
+++ b/docker/rockylinux9/Dockerfile
@@ -179,8 +179,7 @@ RUN <<EOF
cd /root/
mkdir libswoc
cd libswoc
- wget -O CMakeLists.txt
https://raw.githubusercontent.com/apache/trafficserver/master/lib/swoc/CMakeLists.txt
- swoc_version=$(awk '/LIBSWOC_VERSION/ {print $NF; exit}' CMakeLists.txt | tr
-d '")')
+ swoc_version=1.5.13
# Now, checkout that version and install libswoc in /opt/libswoc
git clone https://github.com/apache/trafficserver-libswoc.git