Skip to content

Commit 0d57e87

Browse files
authored
Downgrade Lua modules for s390x (#7355)
Downgrade Lua modules to last known working version.
1 parent 33bf063 commit 0d57e87

File tree

1 file changed

+24
-1
lines changed

1 file changed

+24
-1
lines changed

images/nginx/rootfs/build.sh

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ export BUILD_PATH=/tmp/build
6262

6363
ARCH=$(uname -m)
6464

65+
if [[ ${ARCH} == "s390x" ]]; then
66+
export LUAJIT_VERSION=9d5750d28478abfdcaefdfdc408f87752a21e431
67+
export LUA_RESTY_CORE=0.1.17
68+
export LUA_NGX_VERSION=0.10.15
69+
export LUA_STREAM_NGX_VERSION=0.0.7
70+
fi
71+
6572
get_src()
6673
{
6774
hash="$1"
@@ -159,17 +166,28 @@ get_src 3a3a03060bf5e3fef52c9a2de02e6035cb557f389453d8f3b0c1d3d570636994 \
159166
get_src 464f46744a6be778626d11452c4db3c2d09461080c6db42e358e21af19d542f6 \
160167
"https://github.com/msgpack/msgpack-c/archive/cpp-$MSGPACK_VERSION.tar.gz"
161168

169+
if [[ ${ARCH} == "s390x" ]]; then
170+
get_src 7d5f3439c8df56046d0564b5857fd8a30296ab1bd6df0f048aed7afb56a0a4c2 \
171+
"https://github.com/openresty/lua-nginx-module/archive/v$LUA_NGX_VERSION.tar.gz"
172+
get_src 99c47c75c159795c9faf76bbb9fa58e5a50b75286c86565ffcec8514b1c74bf9 \
173+
"https://github.com/openresty/stream-lua-nginx-module/archive/v$LUA_STREAM_NGX_VERSION.tar.gz"
174+
else
162175
get_src 7dc05df3d1824b02c6958ff37f9e682b73c1737dcfee93212ca3f6c5bfae08f3 \
163176
"https://github.com/openresty/lua-nginx-module/archive/$LUA_NGX_VERSION.tar.gz"
164-
165177
get_src 6fcf7054f412a19c23c1ac3c0663f42f40bccc907d98c5d1657ae5cab9973ee9 \
166178
"https://github.com/openresty/stream-lua-nginx-module/archive/v$LUA_STREAM_NGX_VERSION.tar.gz"
179+
fi
167180

168181
get_src 2a69815e4ae01aa8b170941a8e1a10b6f6a9aab699dee485d58f021dd933829a \
169182
"https://github.com/openresty/lua-upstream-nginx-module/archive/v$LUA_UPSTREAM_VERSION.tar.gz"
170183

184+
if [[ ${ARCH} == "s390x" ]]; then
185+
get_src 266ed1abb70a9806d97cb958537a44b67db6afb33d3b32292a2d68a2acedea75 \
186+
"https://github.com/openresty/luajit2/archive/$LUAJIT_VERSION.tar.gz"
187+
else
171188
get_src f74a0821b079ea1fd63dd8659064356fc3f421ff4b35c17877140d2b2841cc3b \
172189
"https://github.com/openresty/luajit2/archive/v$LUAJIT_VERSION.tar.gz"
190+
fi
173191

174192
get_src 40cc298f22bc29621024b68503335dcce464e42bcf02246f5864d7f8f2f5c379 \
175193
"https://github.com/DataDog/dd-opentracing-cpp/archive/$DATADOG_CPP_VERSION.tar.gz"
@@ -192,8 +210,13 @@ get_src bfd8c4b6c90aa9dcbe047ac798593a41a3f21edcb71904d50d8ac0e8c77d1132 \
192210
get_src a21ec0d78a5dc5856df2374890a8a58e51de866b3d5978aceb0109a094367630 \
193211
"https://github.com/openresty/lua-resty-balancer/archive/$LUA_RESTY_BALANCER.tar.gz"
194212

213+
if [[ ${ARCH} == "s390x" ]]; then
214+
get_src 8f5f76d2689a3f6b0782f0a009c56a65e4c7a4382be86422c9b3549fe95b0dc4 \
215+
"https://github.com/openresty/lua-resty-core/archive/v$LUA_RESTY_CORE.tar.gz"
216+
else
195217
get_src a377fbce78ba10f3ed3a8b5173ea318f8cf8da9d2ab127bb1e1f263078bf7da0 \
196218
"https://github.com/openresty/lua-resty-core/archive/v$LUA_RESTY_CORE.tar.gz"
219+
fi
197220

198221
get_src bd6bee4ccc6cf3307ab6ca0eea693a921fab9b067ba40ae12a652636da588ff7 \
199222
"https://github.com/openresty/lua-cjson/archive/$LUA_CJSON_VERSION.tar.gz"

0 commit comments

Comments
 (0)