use alpine-pkg-glibc

Author: gxthrj

build-apisix-base.sh

@@ -29,6 +29,17 @@ or_ver="1.19.3.2"
 wget --no-check-certificate https://openresty.org/download/openresty-${or_ver}.tar.gz
 tar -zxvpf openresty-${or_ver}.tar.gz
 
+if [ "$repo" == wasm-nginx-module ]; then
+    cp -r "$prev_workdir" .
+else
+    git clone --depth=1 $wasm_nginx_module_ver \
+        https://github.com/api7/wasm-nginx-module.git
+fi
+
+cd wasm-nginx-module || exit 1
+./install-wasmtime.sh
+cd ..
+
 if [ "$repo" == ngx_multi_upstream_module ]; then
     cp -r "$prev_workdir" .
 else
@@ -50,12 +61,7 @@ else
         https://github.com/api7/apisix-nginx-module.git
 fi
 
-if [ "$repo" == wasm-nginx-module ]; then
-    cp -r "$prev_workdir" .
-else
-    git clone --depth=1 $wasm_nginx_module_ver \
-        https://github.com/api7/wasm-nginx-module.git
-fi
+
 
 if [ "$repo" == lua-var-nginx-module ]; then
     cp -r "$prev_workdir" .
@@ -72,9 +78,6 @@ cd apisix-nginx-module/patch || exit 1
 ./patch.sh ../../openresty-${or_ver}
 cd ../..
 
-cd wasm-nginx-module || exit 1
-./install-wasmtime.sh
-cd ..
 
 version=${version:-0.0.0}
 cc_opt=${cc_opt:-}

dockerfiles/Dockerfile.apisix-base.apk

@@ -39,16 +39,22 @@ RUN apk add --no-cache --virtual .build-deps \
     && apk add --no-cache \
         gd \
         geoip \
-        libgcc \
         libxslt \
         zlib \
         bash \
         git \
         sudo \
         curl \
         build-base \
-        g++ \
-        libc6-compat
+        libstdc++ 
+
+RUN cd /tmp \
+    && GLIBC_VER="2.29-r0" && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VER}/glibc-${GLIBC_VER}.apk && \
+    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VER}/glibc-bin-${GLIBC_VER}.apk && \
+    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VER}/glibc-i18n-${GLIBC_VER}.apk && \
+    apk add glibc-bin-${GLIBC_VER}.apk glibc-i18n-${GLIBC_VER}.apk glibc-${GLIBC_VER}.apk
 
 RUN cd /tmp \
     && if [ -n "${RESTY_EVAL_PRE_CONFIGURE}" ]; then eval $(echo ${RESTY_EVAL_PRE_CONFIGURE}); fi \