This is an automated email from the ASF dual-hosted git repository. kvn pushed a commit to branch revert-210-r2.9 in repository https://gitbox.apache.org/repos/asf/apisix-docker.git
commit 8bc6cd92f9fbb55cbe0dbeacb436355a833416ad Author: kv <[email protected]> AuthorDate: Fri Sep 3 17:17:00 2021 +0800 Revert "feat: upgrade APISIX to 2.9 (#210)" This reverts commit 929d620d79088352b3f5106eb5fce101586430e6. --- .github/workflows/apisix-docker-test.yaml | 2 +- Makefile | 2 +- alpine/Dockerfile | 2 +- centos/Dockerfile | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/apisix-docker-test.yaml b/.github/workflows/apisix-docker-test.yaml index 9d24f16..991a05d 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.9-${{ matrix.platform }} + APISIX_DOCKER_TAG: 2.8-${{ matrix.platform }} steps: - uses: actions/checkout@v2 diff --git a/Makefile b/Makefile index 1dc511c..4de3cbb 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ # default: help -APISIX_VERSION ?= 2.9 +APISIX_VERSION ?= 2.8 IMAGE_NAME = apache/apisix IMAGE_TAR_NAME = apache_apisix diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 97a853c..e9b6a30 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.9 +ARG APISIX_VERSION=2.8 LABEL apisix_version="${APISIX_VERSION}" ARG ENABLE_PROXY diff --git a/centos/Dockerfile b/centos/Dockerfile index c2ec5d0..17e5543 100644 --- a/centos/Dockerfile +++ b/centos/Dockerfile @@ -1,12 +1,12 @@ FROM centos:7 -ARG APISIX_VERSION=2.9 +ARG APISIX_VERSION=2.8 LABEL apisix_version="${APISIX_VERSION}" RUN yum -y install yum-utils\ && yum-config-manager --add-repo https://openresty.org/package/centos/openresty.repo \ - && yum install -y pcre openresty which tzdata \ - && yum install -y https://github.com/apache/apisix/releases/download/$APISIX_VERSION/apisix-$APISIX_VERSION-0.el7.x86_64.rpm \ + && yum install -y openresty which tzdata \ + && yum install -y https://github.com/apache/apisix/releases/download/$APISIX_VERSION/apisix-$APISIX_VERSION-0.x86_64.rpm \ && yum clean all \ && sed -i 's/PASS_MAX_DAYS\t99999/PASS_MAX_DAYS\t60/g' /etc/login.defs
