This is an automated email from the ASF dual-hosted git repository.
spacewander 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 a30e08f feat: upgrade APISIX to 2.15.0 (#338)
a30e08f is described below
commit a30e08f77795cacebaded3a85f83b3b523b3c4f0
Author: soulbird <[email protected]>
AuthorDate: Fri Jul 29 10:41:24 2022 +0800
feat: upgrade APISIX to 2.15.0 (#338)
---
.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 f19341b..a711523 100644
--- a/.github/workflows/apisix-docker-test.yaml
+++ b/.github/workflows/apisix-docker-test.yaml
@@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest
env:
- APISIX_DOCKER_TAG: 2.14.1-${{ matrix.platform }}
+ APISIX_DOCKER_TAG: 2.15.0-${{ matrix.platform }}
steps:
- uses: actions/checkout@v2
diff --git a/Makefile b/Makefile
index f29b91d..a18ac4a 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@
# APISIX ARGS
-APISIX_VERSION ?= 2.14.1
+APISIX_VERSION ?= 2.15.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 ac6bd20..ba0f709 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.14.1
+ARG APISIX_VERSION=2.15.0
ARG ETCD_VERSION=v3.4.14
# Build Apache APISIX
-FROM api7/apisix-base:1.19.9.1.6 AS production-stage
+FROM api7/apisix-base:1.21.4.1.1 AS production-stage
ARG APISIX_VERSION
LABEL apisix_version="${APISIX_VERSION}"
diff --git a/alpine-dev/Dockerfile b/alpine-dev/Dockerfile
index f5c4300..b882e68 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.6 AS production-stage
+FROM api7/apisix-base:1.21.4.1.1 AS production-stage
ARG ENABLE_PROXY
RUN set -x \
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 55218ee..fe5dec5 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.6
+FROM api7/apisix-base:1.21.4.1.1
-ARG APISIX_VERSION=2.14.1
+ARG APISIX_VERSION=2.15.0
LABEL apisix_version="${APISIX_VERSION}"
ARG ENABLE_PROXY
diff --git a/centos/Dockerfile b/centos/Dockerfile
index b35a642..c48184c 100644
--- a/centos/Dockerfile
+++ b/centos/Dockerfile
@@ -17,7 +17,7 @@
FROM centos:7
-ARG APISIX_VERSION=2.14.1
+ARG APISIX_VERSION=2.15.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 c39721c..5af4746 100644
--- a/example/docker-compose-arm64.yml
+++ b/example/docker-compose-arm64.yml
@@ -29,7 +29,7 @@ services:
apisix:
apisix:
- image: apache/apisix:2.14.1-alpine
+ image: apache/apisix:2.15.0-alpine
restart: always
volumes:
- ./apisix_log:/usr/local/apisix/logs
diff --git a/example/docker-compose.yml b/example/docker-compose.yml
index 2688bce..aa8bd01 100644
--- a/example/docker-compose.yml
+++ b/example/docker-compose.yml
@@ -29,7 +29,7 @@ services:
apisix:
apisix:
- image: apache/apisix:2.14.1-alpine
+ image: apache/apisix:2.15.0-alpine
restart: always
volumes:
- ./apisix_log:/usr/local/apisix/logs
