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 8cccfb9 Make debian/ubuntu Dockerfile cmake install work on arm.
(#368)
8cccfb9 is described below
commit 8cccfb90d98c5f56c904931b5e8a301ac487de1e
Author: Brian Neradt <[email protected]>
AuthorDate: Tue Jan 14 15:04:34 2025 -0600
Make debian/ubuntu Dockerfile cmake install work on arm. (#368)
---
docker/debian11/Dockerfile | 17 +++++++++++++----
docker/ubuntu2004/Dockerfile | 17 +++++++++++++----
2 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/docker/debian11/Dockerfile b/docker/debian11/Dockerfile
index 89d5abb..20487a7 100644
--- a/docker/debian11/Dockerfile
+++ b/docker/debian11/Dockerfile
@@ -23,10 +23,19 @@ EOF
RUN <<EOF
set -e
cd /root
- wget
https://github.com/Kitware/CMake/releases/download/v3.27.7/cmake-3.27.7-linux-x86_64.sh
- chmod +x cmake-3.27.7-linux-x86_64.sh
- bash ./cmake-3.27.7-linux-x86_64.sh --skip-license --prefix=/opt
- rm cmake-3.27.7-linux-x86_64.sh
+
+ if [ `uname -m` = "arm64" -o `uname -m` = "aarch64" ]; then
+ arch="aarch64"
+ else
+ arch="x86_64"
+ fi
+ version=3.27.7
+ installer="cmake-${version}-linux-${arch}.sh"
+
+ wget
https://github.com/Kitware/CMake/releases/download/v${version}/${installer}
+ chmod +x ${installer}
+ bash ${installer} --skip-license --prefix=/opt
+ rm ${installer}
EOF
# Add the CI's test user. N.B: 1200 is the uid that our jenkins user is
diff --git a/docker/ubuntu2004/Dockerfile b/docker/ubuntu2004/Dockerfile
index fb60276..4802a38 100644
--- a/docker/ubuntu2004/Dockerfile
+++ b/docker/ubuntu2004/Dockerfile
@@ -25,10 +25,19 @@ EOF
RUN <<EOF
set -e
cd /root
- wget
https://github.com/Kitware/CMake/releases/download/v3.27.7/cmake-3.27.7-linux-x86_64.sh
- chmod +x cmake-3.27.7-linux-x86_64.sh
- bash ./cmake-3.27.7-linux-x86_64.sh --skip-license --prefix=/opt
- rm cmake-3.27.7-linux-x86_64.sh
+
+ if [ `uname -m` = "arm64" -o `uname -m` = "aarch64" ]; then
+ arch="aarch64"
+ else
+ arch="x86_64"
+ fi
+ version=3.27.7
+ installer="cmake-${version}-linux-${arch}.sh"
+
+ wget
https://github.com/Kitware/CMake/releases/download/v${version}/${installer}
+ chmod +x ${installer}
+ bash ${installer} --skip-license --prefix=/opt
+ rm ${installer}
EOF
# We put our custom packages in /opt and we want to use the llvm clang-12.
