From 895469289ff460f5fab9cef62754f26088f37570 Mon Sep 17 00:00:00 2001 From: tzssangglass Date: Fri, 19 Nov 2021 17:14:00 +0800 Subject: [PATCH 1/2] feat: upgrade APISIX to 2.10.2 Signed-off-by: tzssangglass --- .github/workflows/apisix-docker-test.yaml | 2 +- Makefile | 2 +- alpine/Dockerfile | 2 +- centos/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/apisix-docker-test.yaml b/.github/workflows/apisix-docker-test.yaml index aebcc68f..d7cdafc5 100644 --- a/.github/workflows/apisix-docker-test.yaml +++ b/.github/workflows/apisix-docker-test.yaml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest env: APISIX_PATH: "./apisix-local" - APISIX_DOCKER_TAG: 2.10.1-${{ matrix.platform }} + APISIX_DOCKER_TAG: 2.10.2-${{ matrix.platform }} steps: - uses: actions/checkout@v2 diff --git a/Makefile b/Makefile index dd7f0b88..733980bd 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ # APISIX ARGS -APISIX_VERSION ?= 2.10.1 +APISIX_VERSION ?= 2.10.2 IMAGE_NAME = apache/apisix IMAGE_TAR_NAME = apache_apisix diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 785e56c9..47c1bbee 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -3,7 +3,7 @@ ARG ENABLE_PROXY=false # Build Apache APISIX FROM api7/apisix-base:1.19.3.2.1 AS production-stage -ARG APISIX_VERSION=2.10.1 +ARG APISIX_VERSION=2.10.2 LABEL apisix_version="${APISIX_VERSION}" ARG ENABLE_PROXY diff --git a/centos/Dockerfile b/centos/Dockerfile index 2c996637..6b7136c4 100644 --- a/centos/Dockerfile +++ b/centos/Dockerfile @@ -1,6 +1,6 @@ FROM centos:7 -ARG APISIX_VERSION=2.10.1.1 +ARG APISIX_VERSION=2.10.2.1 LABEL apisix_version="${APISIX_VERSION}" RUN yum install -y https://repos.apiseven.com/packages/centos/apache-apisix-repo-1.0-1.noarch.rpm \ From ba8c4fd75e28862dbf0081af56f45ee8f3a6a3d8 Mon Sep 17 00:00:00 2001 From: tzssangglass Date: Fri, 19 Nov 2021 20:37:52 +0800 Subject: [PATCH 2/2] update Signed-off-by: tzssangglass --- centos/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/centos/Dockerfile b/centos/Dockerfile index 6b7136c4..5df80e8a 100644 --- a/centos/Dockerfile +++ b/centos/Dockerfile @@ -1,6 +1,6 @@ FROM centos:7 -ARG APISIX_VERSION=2.10.2.1 +ARG APISIX_VERSION=2.10.2 LABEL apisix_version="${APISIX_VERSION}" RUN yum install -y https://repos.apiseven.com/packages/centos/apache-apisix-repo-1.0-1.noarch.rpm \