You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by to...@apache.org on 2021/05/25 03:33:49 UTC

[apisix-docker] branch master updated: feat: upgrade APISIX to 2.6 (#175)

This is an automated email from the ASF dual-hosted git repository.

tokers 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 33f32b2  feat: upgrade APISIX to 2.6 (#175)
33f32b2 is described below

commit 33f32b2e9a3e437a581fbe12fee22ee819cf2d3d
Author: 罗泽轩 <sp...@gmail.com>
AuthorDate: Tue May 25 10:53:30 2021 +0800

    feat: upgrade APISIX to 2.6 (#175)
---
 .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 f44cee5..f102b26 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.5-${{ matrix.platform }}
+      APISIX_DOCKER_TAG: 2.6-${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v2
 
diff --git a/Makefile b/Makefile
index 182f91d..edbc0df 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 #
 default: help
 
-APISIX_VERSION ?= 2.5
+APISIX_VERSION ?= 2.6
 IMAGE_NAME = apache/apisix
 IMAGE_TAR_NAME = apache_apisix
 
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 63bd029..ac9b16a 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -2,7 +2,7 @@ ARG ENABLE_PROXY=false
 
 FROM openresty/openresty:1.19.3.1-alpine-fat AS production-stage
 
-ARG APISIX_VERSION=2.5
+ARG APISIX_VERSION=2.6
 LABEL apisix_version="${APISIX_VERSION}"
 
 ARG ENABLE_PROXY
diff --git a/centos/Dockerfile b/centos/Dockerfile
index ac7b42e..172b8b5 100644
--- a/centos/Dockerfile
+++ b/centos/Dockerfile
@@ -1,6 +1,6 @@
 FROM centos:7
 
-ARG APISIX_VERSION=2.5
+ARG APISIX_VERSION=2.6
 LABEL apisix_version="${APISIX_VERSION}"
 
 RUN yum -y install yum-utils\