From 87f640cffa3ac88a60876799447900cc8d6e6aa4 Mon Sep 17 00:00:00 2001
From: liam <liang.he@intel.com>
Date: Thu, 13 Jan 2022 02:55:06 +0800
Subject: [PATCH] Use clang+llvm released binaries instead of "apt install"

[skip ci]
---
 ci/Dockerfile    | 17 ++++++++++++-----
 ci/build_wamr.sh |  1 -
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ci/Dockerfile b/ci/Dockerfile
index 9618334f68..5ea43f11ab 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -1,6 +1,8 @@
 # Copyright (C) 2019 Intel Corporation.  All rights reserved.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+# tie the ${VARIANT} and a llvm binary release together
+# please find a matched version on https://github.com/llvm/llvm-project/releases
 ARG VARIANT=focal
 FROM ubuntu:${VARIANT}
 
@@ -35,9 +37,14 @@ RUN cd /opt/emsdk \
   && echo "source /opt/emsdk/emsdk_env.sh" >> /root/.bashrc
 
 #
-# install clang and llvm
-RUN cd /tmp && wget https://apt.llvm.org/llvm.sh && chmod a+x llvm.sh
-RUN cd /tmp && ./llvm.sh 12
+# install clang and llvm release
+ARG CLANG_VER=13.0.0
+RUN wget https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VER}/clang+llvm-${CLANG_VER}-x86_64-linux-gnu-ubuntu-20.04.tar.xz -P /opt
+RUN cd /opt \
+  && tar xf clang+llvm-${CLANG_VER}-x86_64-linux-gnu-ubuntu-20.04.tar.xz \
+  && ln -sf clang+llvm-${CLANG_VER}-x86_64-linux-gnu-ubuntu-20.04 clang-llvm
+RUN rm /opt/clang+llvm-${CLANG_VER}-x86_64-linux-gnu-ubuntu-20.04.tar.xz
+
 
 #
 # install wasi-sdk
@@ -68,8 +75,8 @@ RUN chmod a+x /opt/bazelisk/bazelisk-linux-amd64 \
 RUN apt update && apt install -y clang-format
 
 # set path
-ENV PATH "$PATH:/opt/wasi-sdk/bin:/opt/wabt/bin:/opt/binaryen/bin:/opt/bazelisk"
-RUN echo "export PATH=/opt/wasi-sdk/bin:/opt/wabt/bin:/opt/binaryen/bin:/opt/bazelisk:${PATH}" >> /root/.bashrc
+ENV PATH "$PATH:/opt/wasi-sdk/bin:/opt/wabt/bin:/opt/binaryen/bin:/opt/bazelisk:/opt/clang-llvm/bin"
+RUN echo "export PATH=/opt/wasi-sdk/bin:/opt/wabt/bin:/opt/binaryen/bin:/opt/bazelisk:/opt/clang-llvm/bin:${PATH}" >> /root/.bashrc
 
 #
 # PS
diff --git a/ci/build_wamr.sh b/ci/build_wamr.sh
index 82a1ff5087..b7e6c049d3 100755
--- a/ci/build_wamr.sh
+++ b/ci/build_wamr.sh
@@ -8,7 +8,6 @@ readonly ROOT=$(realpath "${CURRENT_PATH}/..")
 readonly VARIANT=$(lsb_release -c | awk '{print $2}')
 
 docker build \
-    --build-arg VARIANT=${VARIANT} \
     --memory=4G --cpu-quota=50000 \
     -t wamr_dev_${VARIANT}:0.1 -f "${CURRENT_PATH}"/Dockerfile "${CURRENT_PATH}" \
   && docker run --rm -it \