feat: bump APISIX to 2.10.0 (#230)
diff --git a/.github/workflows/apisix-docker-test.yaml b/.github/workflows/apisix-docker-test.yaml
index 9d24f16..02c8d06 100644
--- a/.github/workflows/apisix-docker-test.yaml
+++ b/.github/workflows/apisix-docker-test.yaml
@@ -21,7 +21,7 @@
runs-on: ubuntu-latest
env:
APISIX_PATH: "./apisix-local"
- APISIX_DOCKER_TAG: 2.9-${{ matrix.platform }}
+ APISIX_DOCKER_TAG: 2.10.0-${{ matrix.platform }}
steps:
- uses: actions/checkout@v2
diff --git a/Makefile b/Makefile
index 3f91f33..c4404f9 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@
# APISIX ARGS
-APISIX_VERSION ?= 2.9
+APISIX_VERSION ?= 2.10.0
IMAGE_NAME = apache/apisix
IMAGE_TAR_NAME = apache_apisix
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 97a853c..a41419f 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -2,7 +2,7 @@
FROM openresty/openresty:1.19.3.1-alpine-fat AS production-stage
-ARG APISIX_VERSION=2.9
+ARG APISIX_VERSION=2.10.0
LABEL apisix_version="${APISIX_VERSION}"
ARG ENABLE_PROXY
@@ -22,7 +22,7 @@
&& 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 \
&& 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;) \
+ && (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;) \
&& mv /usr/local/apisix/deps/share/lua/5.1/apisix /usr/local/apisix \
&& apk del .builddeps build-base make unzip
diff --git a/centos/Dockerfile b/centos/Dockerfile
index c2ec5d0..e26f8b7 100644
--- a/centos/Dockerfile
+++ b/centos/Dockerfile
@@ -1,6 +1,6 @@
FROM centos:7
-ARG APISIX_VERSION=2.9
+ARG APISIX_VERSION=2.10.0
LABEL apisix_version="${APISIX_VERSION}"
RUN yum -y install yum-utils\
