You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by sp...@apache.org on 2022/01/11 06:15:12 UTC
[apisix-docker] branch master updated: ci: converts git:// to https://, so chaos test can pass (#268)
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 f440660 ci: converts git:// to https://, so chaos test can pass (#268)
f440660 is described below
commit f440660731577c34aa262ddb0596a76e0088ac89
Author: 罗泽轩 <sp...@gmail.com>
AuthorDate: Tue Jan 11 14:07:14 2022 +0800
ci: converts git:// to https://, so chaos test can pass (#268)
---
.github/workflows/apisix_all_in_one_ci.yaml | 2 +-
all-in-one/apisix-dashboard/Dockerfile | 1 +
all-in-one/apisix/Dockerfile | 3 ++-
alpine-dev/Dockerfile | 1 +
alpine-local/Dockerfile | 1 +
alpine/Dockerfile | 1 +
6 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/apisix_all_in_one_ci.yaml b/.github/workflows/apisix_all_in_one_ci.yaml
index 8aeae32..5d24c6d 100644
--- a/.github/workflows/apisix_all_in_one_ci.yaml
+++ b/.github/workflows/apisix_all_in_one_ci.yaml
@@ -17,6 +17,6 @@ jobs:
- name: Build and Test
run: |
docker build -t apache/apisix:whole -f ./all-in-one/apisix/Dockerfile .
- docker run -v `pwd`/all-in-one/apisix/config.yaml:/usr/local/apisix/conf/config.yaml -p 9080:9080 -p 2379:2379 -d apache/apisix:whole
+ docker run -v `pwd`/all-in-one/apisix/config.yaml:/usr/local/apisix/conf/config.yaml -p 9080:9080 -p 2379:2379 --name apisix -d apache/apisix:whole
sleep 30
curl http://127.0.0.1:9080/apisix/admin/schema/service -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1'
diff --git a/all-in-one/apisix-dashboard/Dockerfile b/all-in-one/apisix-dashboard/Dockerfile
index ba62346..c7a4432 100644
--- a/all-in-one/apisix-dashboard/Dockerfile
+++ b/all-in-one/apisix-dashboard/Dockerfile
@@ -42,6 +42,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 \
+ && git config --global url.https://github.com/.insteadOf git://github.com/ \
&& luarocks install https://github.com/apache/apisix/raw/master/rockspec/apisix-${APISIX_VERSION}-0.rockspec --tree=/usr/local/apisix/deps \
&& 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;) \
diff --git a/all-in-one/apisix/Dockerfile b/all-in-one/apisix/Dockerfile
index 5ec843e..dd8e367 100644
--- a/all-in-one/apisix/Dockerfile
+++ b/all-in-one/apisix/Dockerfile
@@ -16,7 +16,7 @@
#
ARG ENABLE_PROXY=false
-ARG APISIX_VERSION=master
+ARG APISIX_VERSION=2.11.0
ARG ETCD_VERSION=v3.4.14
# Build Apache APISIX
@@ -39,6 +39,7 @@ RUN set -x \
pcre \
pcre-dev \
openldap-dev \
+ && git config --global url.https://github.com/.insteadOf git://github.com/ \
&& luarocks install https://github.com/apache/apisix/raw/master/rockspec/apisix-${APISIX_VERSION}-0.rockspec --tree=/usr/local/apisix/deps \
&& cp -v /usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/${APISIX_VERSION}-0/bin/apisix /usr/bin/ \
&& (function ver_lt { [ "$1" = "$2" ] && return 1 || [ "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ]; }; if [ "$APISIX_VERSION" = "master" ] || ver_lt 2.2.0 $APISIX_VERSION; 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;) \
diff --git a/alpine-dev/Dockerfile b/alpine-dev/Dockerfile
index 26818b1..2be5851 100644
--- a/alpine-dev/Dockerfile
+++ b/alpine-dev/Dockerfile
@@ -32,6 +32,7 @@ RUN set -x \
pcre \
pcre-dev \
openldap-dev \
+ && git config --global url.https://github.com/.insteadOf git://github.com/ \
&& luarocks install https://github.com/apache/apisix/raw/master/rockspec/apisix-master-0.rockspec --tree=/usr/local/apisix/deps \
&& 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 \
diff --git a/alpine-local/Dockerfile b/alpine-local/Dockerfile
index fa2d607..a625c70 100644
--- a/alpine-local/Dockerfile
+++ b/alpine-local/Dockerfile
@@ -35,6 +35,7 @@ RUN set -x \
pcre-dev \
openldap-dev \
&& cd apisix \
+ && git config --global url.https://github.com/.insteadOf git://github.com/ \
&& make deps \
&& cp -v bin/apisix /usr/bin/ \
&& mv ../apisix /usr/local/apisix \
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 7721dbd..f33eeb4 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -36,6 +36,7 @@ RUN set -x \
pcre \
pcre-dev \
openldap-dev \
+ && git config --global url.https://github.com/.insteadOf git://github.com/ \
&& luarocks install https://github.com/apache/apisix/raw/master/rockspec/apisix-${APISIX_VERSION}-0.rockspec --tree=/usr/local/apisix/deps \
&& cp -v /usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/${APISIX_VERSION}-0/bin/apisix /usr/bin/ \
&& (function ver_lt { [ "$1" = "$2" ] && return 1 || [ "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ]; }; if [ "$APISIX_VERSION" = "master" ] || ver_lt 2.2.0 $APISIX_VERSION; 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;) \