From 07714179089ffe15c4b154cf3d4d2b293e6d54cd Mon Sep 17 00:00:00 2001
From: AlinsRan <alinsran@apache.org>
Date: Wed, 31 Jan 2024 12:48:39 +0800
Subject: [PATCH] fix wasmtime

---
 build-apisix-runtime.sh                   | 4 ++--
 dockerfiles/Dockerfile.apisix-runtime.rpm | 8 +++++++-
 utils/build-common.sh                     | 4 ----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/build-apisix-runtime.sh b/build-apisix-runtime.sh
index 5c68fb56d..c818fba6d 100755
--- a/build-apisix-runtime.sh
+++ b/build-apisix-runtime.sh
@@ -25,7 +25,7 @@ OPENRESTY_VERSION="1.21.4.2"
 ngx_multi_upstream_module_ver="1.1.1"
 mod_dubbo_ver="1.0.2"
 apisix_nginx_module_ver="1.15.0"
-wasm_nginx_module_ver="0.6.5"
+wasm_nginx_module_ver="0.6.6"
 lua_var_nginx_module_ver="v0.5.3"
 grpc_client_nginx_module_ver="v0.4.4"
 lua_resty_events_ver="0.2.0"
@@ -116,7 +116,7 @@ if [ "$repo" == wasm-nginx-module ]; then
     cp -r "$prev_workdir" ./wasm-nginx-module-${wasm_nginx_module_ver}
 else
     git clone --depth=1 -b $wasm_nginx_module_ver \
-        https://github.com/api7/wasm-nginx-module.git \
+        https://github.com/AlinsRan/wasm-nginx-module.git \
         wasm-nginx-module-${wasm_nginx_module_ver}
 fi
 
diff --git a/dockerfiles/Dockerfile.apisix-runtime.rpm b/dockerfiles/Dockerfile.apisix-runtime.rpm
index ee116271a..65a9e5e33 100644
--- a/dockerfiles/Dockerfile.apisix-runtime.rpm
+++ b/dockerfiles/Dockerfile.apisix-runtime.rpm
@@ -30,7 +30,13 @@ ENV runtime_version=${RUNTIME_VERSION}
 
 COPY ${CODE_PATH} ./
 
-RUN mv ./utils/build-common.sh ./utils/determine-dist.sh ./ \
+RUN yum install -y curl \
+    && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
+    && source "$HOME/.cargo/env" \
+    && rustup install 1.69 \
+    && rustup default 1.69 \
+    # build apisix runtime
+    && mv ./utils/build-common.sh ./utils/determine-dist.sh ./ \
     && ./build-common.sh build_apisix_runtime_rpm \
     # determine dist and write it into /tmp/dist file
     && ./determine-dist.sh
diff --git a/utils/build-common.sh b/utils/build-common.sh
index fcee9116c..dc660a286 100755
--- a/utils/build-common.sh
+++ b/utils/build-common.sh
@@ -75,10 +75,6 @@ build_apisix_runtime_rpm() {
         set +eu
         source scl_source enable devtoolset-9
         set -eu
-        curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-        source "$HOME/.cargo/env"
-        rustup install 1.69
-        rustup default 1.69
     elif [[ $(rpm --eval '%{centos_ver}') == "8" ]]; then
         dnf install -y gcc-toolset-9-toolchain patch wget git make sudo cpanminus
         dnf install -y yum-utils