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/05/23 06:31:18 UTC
[apisix-docker] 01/01: feat: upgrade APISIX to 2.14.0
This is an automated email from the ASF dual-hosted git repository.
spacewander pushed a commit to branch release/apisix-2.14.0
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git
commit f03b97737cc83251a281237b8f06252688daf686
Author: spacewander <sp...@gmail.com>
AuthorDate: Mon May 23 14:30:57 2022 +0800
feat: upgrade APISIX to 2.14.0
Signed-off-by: spacewander <sp...@gmail.com>
---
.github/workflows/apisix-docker-test.yaml | 2 +-
Makefile | 2 +-
all-in-one/apisix/Dockerfile | 4 ++--
alpine-dev/Dockerfile | 2 +-
alpine/Dockerfile | 4 ++--
centos/Dockerfile | 2 +-
example/docker-compose-arm64.yml | 2 +-
example/docker-compose.yml | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/apisix-docker-test.yaml b/.github/workflows/apisix-docker-test.yaml
index 1453533..1520a95 100644
--- a/.github/workflows/apisix-docker-test.yaml
+++ b/.github/workflows/apisix-docker-test.yaml
@@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest
env:
APISIX_PATH: "./apisix-local"
- APISIX_DOCKER_TAG: 2.13.1-${{ matrix.platform }}
+ APISIX_DOCKER_TAG: 2.14.0-${{ matrix.platform }}
steps:
- uses: actions/checkout@v2
diff --git a/Makefile b/Makefile
index b7b9276..d615a39 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@
# APISIX ARGS
-APISIX_VERSION ?= 2.13.1
+APISIX_VERSION ?= 2.14.0
IMAGE_NAME = apache/apisix
IMAGE_TAR_NAME = apache_apisix
diff --git a/all-in-one/apisix/Dockerfile b/all-in-one/apisix/Dockerfile
index e8af7a2..04d5643 100644
--- a/all-in-one/apisix/Dockerfile
+++ b/all-in-one/apisix/Dockerfile
@@ -16,11 +16,11 @@
#
ARG ENABLE_PROXY=false
-ARG APISIX_VERSION=2.13.1
+ARG APISIX_VERSION=2.14.0
ARG ETCD_VERSION=v3.4.14
# Build Apache APISIX
-FROM api7/apisix-base:1.19.9.1.5 AS production-stage
+FROM api7/apisix-base:1.19.9.1.6 AS production-stage
ARG APISIX_VERSION
LABEL apisix_version="${APISIX_VERSION}"
diff --git a/alpine-dev/Dockerfile b/alpine-dev/Dockerfile
index dc0b1f5..80b0d09 100644
--- a/alpine-dev/Dockerfile
+++ b/alpine-dev/Dockerfile
@@ -17,7 +17,7 @@
ARG ENABLE_PROXY=false
-FROM api7/apisix-base:1.19.9.1.5 AS production-stage
+FROM api7/apisix-base:1.19.9.1.6 AS production-stage
ARG ENABLE_PROXY
RUN set -x \
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index db2afc1..bd71ad0 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -18,9 +18,9 @@
ARG ENABLE_PROXY=false
# Build Apache APISIX
-FROM api7/apisix-base:1.19.9.1.5
+FROM api7/apisix-base:1.19.9.1.6
-ARG APISIX_VERSION=2.13.1
+ARG APISIX_VERSION=2.14.0
LABEL apisix_version="${APISIX_VERSION}"
ARG ENABLE_PROXY
diff --git a/centos/Dockerfile b/centos/Dockerfile
index d3b1898..d696f98 100644
--- a/centos/Dockerfile
+++ b/centos/Dockerfile
@@ -17,7 +17,7 @@
FROM centos:7
-ARG APISIX_VERSION=2.13.1
+ARG APISIX_VERSION=2.14.0
LABEL apisix_version="${APISIX_VERSION}"
RUN yum install -y https://repos.apiseven.com/packages/centos/apache-apisix-repo-1.0-1.noarch.rpm \
diff --git a/example/docker-compose-arm64.yml b/example/docker-compose-arm64.yml
index 7b1aed0..cb425fe 100644
--- a/example/docker-compose-arm64.yml
+++ b/example/docker-compose-arm64.yml
@@ -29,7 +29,7 @@ services:
apisix:
apisix:
- image: apache/apisix:2.13.1-alpine
+ image: apache/apisix:2.14.0-alpine
restart: always
volumes:
- ./apisix_log:/usr/local/apisix/logs
diff --git a/example/docker-compose.yml b/example/docker-compose.yml
index 79e662b..4e20260 100644
--- a/example/docker-compose.yml
+++ b/example/docker-compose.yml
@@ -29,7 +29,7 @@ services:
apisix:
apisix:
- image: apache/apisix:2.13.1-alpine
+ image: apache/apisix:2.14.0-alpine
restart: always
volumes:
- ./apisix_log:/usr/local/apisix/logs