This is an automated email from the ASF dual-hosted git repository.
spacewander pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git
The following commit(s) were added to refs/heads/master by this push:
new cae84f9 fix: build failure caused by luarocks connection (#162)
cae84f9 is described below
commit cae84f92213dc6db59785146294f5fca3dc9e7ea
Author: Shuyang Wu <[email protected]>
AuthorDate: Mon Apr 12 14:42:23 2021 +0800
fix: build failure caused by luarocks connection (#162)
---
all-in-one/apisix-dashboard/Dockerfile | 2 +-
all-in-one/apisix/Dockerfile | 2 +-
alpine-dev/Dockerfile | 2 +-
alpine-local/Dockerfile | 2 +-
alpine/Dockerfile | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/all-in-one/apisix-dashboard/Dockerfile
b/all-in-one/apisix-dashboard/Dockerfile
index 721dbb8..8f0937e 100644
--- a/all-in-one/apisix-dashboard/Dockerfile
+++ b/all-in-one/apisix-dashboard/Dockerfile
@@ -22,7 +22,7 @@ RUN set -x \
&& mkdir ~/.luarocks \
&& luarocks config variables.OPENSSL_LIBDIR
/usr/local/openresty/openssl/lib \
&& luarocks config variables.OPENSSL_INCDIR
/usr/local/openresty/openssl/include \
- && luarocks install
https://github.com/apache/apisix/raw/master/rockspec/apisix-${APISIX_VERSION}-0.rockspec
--tree=/usr/local/apisix/deps \
+ && (i=0; while true; do if [[ "$i" -eq 10 ]]; then echo "failed to fetch
Lua rocks in time"; exit 1; fi; luarocks install
https://github.com/apache/apisix/raw/master/rockspec/apisix-${APISIX_VERSION}-0.rockspec
--tree=/usr/local/apisix/deps && break; i=$(( i + 1 )); done;) \
&& cp -v
/usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/${APISIX_VERSION}-0/bin/apisix
/usr/bin/ \
&& (if [ "$APISIX_VERSION" = "master" ] || [ "$APISIX_VERSION" \> "2.2" ];
then echo 'use shell ';else bin='#!
/usr/local/openresty/luajit/bin/luajit\npackage.path =
"/usr/local/apisix/?.lua;" .. package.path'; sed -i "1s@.*@$bin@"
/usr/bin/apisix ; fi;) \
&& mv /usr/local/apisix/deps/share/lua/5.1/apisix /usr/local/apisix \
diff --git a/all-in-one/apisix/Dockerfile b/all-in-one/apisix/Dockerfile
index be9b758..0168065 100644
--- a/all-in-one/apisix/Dockerfile
+++ b/all-in-one/apisix/Dockerfile
@@ -22,7 +22,7 @@ RUN set -x \
&& mkdir ~/.luarocks \
&& luarocks config variables.OPENSSL_LIBDIR
/usr/local/openresty/openssl/lib \
&& luarocks config variables.OPENSSL_INCDIR
/usr/local/openresty/openssl/include \
- && luarocks install
https://github.com/apache/apisix/raw/master/rockspec/apisix-${APISIX_VERSION}-0.rockspec
--tree=/usr/local/apisix/deps \
+ && (i=0; while true; do if [[ "$i" -eq 10 ]]; then echo "failed to fetch
Lua rocks in time"; exit 1; fi; luarocks install
https://github.com/apache/apisix/raw/master/rockspec/apisix-${APISIX_VERSION}-0.rockspec
--tree=/usr/local/apisix/deps && break; i=$(( i + 1 )); done;) \
&& cp -v
/usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/${APISIX_VERSION}-0/bin/apisix
/usr/bin/ \
&& (if [ "$APISIX_VERSION" = "master" ] || [ "$APISIX_VERSION" \> "2.2" ];
then echo 'use shell ';else bin='#!
/usr/local/openresty/luajit/bin/luajit\npackage.path =
"/usr/local/apisix/?.lua;" .. package.path'; sed -i "1s@.*@$bin@"
/usr/bin/apisix ; fi;) \
&& mv /usr/local/apisix/deps/share/lua/5.1/apisix /usr/local/apisix \
diff --git a/alpine-dev/Dockerfile b/alpine-dev/Dockerfile
index a2c29c3..47e8a74 100644
--- a/alpine-dev/Dockerfile
+++ b/alpine-dev/Dockerfile
@@ -15,7 +15,7 @@ RUN set -x \
&& mkdir ~/.luarocks \
&& luarocks config variables.OPENSSL_LIBDIR
/usr/local/openresty/openssl/lib \
&& luarocks config variables.OPENSSL_INCDIR
/usr/local/openresty/openssl/include \
- && luarocks install
https://github.com/apache/apisix/raw/master/rockspec/apisix-master-0.rockspec
--tree=/usr/local/apisix/deps \
+ && (i=0; while true; do if [[ "$i" -eq 10 ]]; then echo "failed to fetch
Lua rocks in time"; exit 1; fi; luarocks install
https://github.com/apache/apisix/raw/master/rockspec/apisix-master-0.rockspec
--tree=/usr/local/apisix/deps && break; i=$(( i + 1 )); done;) \
&& cp -v
/usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/master-0/bin/apisix
/usr/bin/ \
&& mv /usr/local/apisix/deps/share/lua/5.1/apisix /usr/local/apisix \
&& apk del .builddeps build-base make unzip
diff --git a/alpine-local/Dockerfile b/alpine-local/Dockerfile
index 75a88fa..ee8659f 100644
--- a/alpine-local/Dockerfile
+++ b/alpine-local/Dockerfile
@@ -15,7 +15,7 @@ RUN set -x \
cmake \
git \
&& cd apisix \
- && make deps \
+ && (i=0; while true; do if [[ "$i" -eq 10 ]]; then echo "failed to make
deps in time"; exit 1; fi; make deps && break; i=$(( i + 1 )); done;) \
&& cp -v bin/apisix /usr/bin/ \
&& mv ../apisix /usr/local/apisix \
&& apk del .builddeps build-base make unzip
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 6c514eb..ac37c6c 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -18,7 +18,7 @@ RUN set -x \
&& mkdir ~/.luarocks \
&& luarocks config variables.OPENSSL_LIBDIR
/usr/local/openresty/openssl/lib \
&& luarocks config variables.OPENSSL_INCDIR
/usr/local/openresty/openssl/include \
- && luarocks install
https://github.com/apache/apisix/raw/master/rockspec/apisix-${APISIX_VERSION}-0.rockspec
--tree=/usr/local/apisix/deps \
+ && (i=0; while true; do if [[ "$i" -eq 10 ]]; then echo "failed to fetch
Lua rocks in time"; exit 1; fi; luarocks install
https://github.com/apache/apisix/raw/master/rockspec/apisix-${APISIX_VERSION}-0.rockspec
--tree=/usr/local/apisix/deps && break; i=$(( i + 1 )); done;) \
&& cp -v
/usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/${APISIX_VERSION}-0/bin/apisix
/usr/bin/ \
&& (if [ "$APISIX_VERSION" = "master" ] || [ "$APISIX_VERSION" \> "2.2" ];
then echo 'use shell ';else bin='#!
/usr/local/openresty/luajit/bin/luajit\npackage.path =
"/usr/local/apisix/?.lua;" .. package.path'; sed -i "1s@.*@$bin@"
/usr/bin/apisix ; fi;) \
&& mv /usr/local/apisix/deps/share/lua/5.1/apisix /usr/local/apisix \
