This is an automated email from the ASF dual-hosted git repository.
alinsran 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 68d7171 feat: release APISIX 3.6.0 (#513)
68d7171 is described below
commit 68d717118fd79bb4eef90a19103dca408792d783
Author: Xin Rong <alins...@apache.org>
AuthorDate: Thu Oct 5 19:11:38 2023 +0800
feat: release APISIX 3.6.0 (#513)
---
.github/workflows/apisix-docker-example-test-standalone.yaml | 2 +-
.github/workflows/apisix-docker-example-test.yaml | 2 +-
.github/workflows/apisix_push_docker_hub.yaml | 2 +-
Makefile | 4 ++--
centos/Dockerfile | 2 +-
debian/Dockerfile | 2 +-
docs/en/latest/build.md | 2 +-
example/docker-compose-arm64.yml | 2 +-
example/docker-compose-standalone.yml | 2 +-
example/docker-compose.yml | 2 +-
redhat/Dockerfile | 2 +-
11 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/apisix-docker-example-test-standalone.yaml
b/.github/workflows/apisix-docker-example-test-standalone.yaml
index f9823c9..c34d80f 100644
--- a/.github/workflows/apisix-docker-example-test-standalone.yaml
+++ b/.github/workflows/apisix-docker-example-test-standalone.yaml
@@ -14,7 +14,7 @@ on:
- 'release/apisix-2.15.**'
env:
- APISIX_VERSION: "3.5.0"
+ APISIX_VERSION: "3.6.0"
jobs:
prepare:
diff --git a/.github/workflows/apisix-docker-example-test.yaml
b/.github/workflows/apisix-docker-example-test.yaml
index 6bc3e8d..495b0d1 100644
--- a/.github/workflows/apisix-docker-example-test.yaml
+++ b/.github/workflows/apisix-docker-example-test.yaml
@@ -14,7 +14,7 @@ on:
- 'release/apisix-2.15.**'
env:
- APISIX_VERSION: "3.5.0"
+ APISIX_VERSION: "3.6.0"
jobs:
prepare:
diff --git a/.github/workflows/apisix_push_docker_hub.yaml
b/.github/workflows/apisix_push_docker_hub.yaml
index f44c8ff..91a8013 100644
--- a/.github/workflows/apisix_push_docker_hub.yaml
+++ b/.github/workflows/apisix_push_docker_hub.yaml
@@ -14,7 +14,7 @@ jobs:
- debian
- redhat
env:
- APISIX_DOCKER_TAG: 3.5.0-${{ matrix.platform }}
+ APISIX_DOCKER_TAG: 3.6.0-${{ matrix.platform }}
steps:
- name: Check out the repo
diff --git a/Makefile b/Makefile
index e2c1bbf..f63be46 100644
--- a/Makefile
+++ b/Makefile
@@ -21,8 +21,8 @@ SHELL := bash
# APISIX ARGS
-APISIX_VERSION ?= 3.5.0
-MAX_APISIX_VERSION ?= 3.5.0
+APISIX_VERSION ?= 3.6.0
+MAX_APISIX_VERSION ?= 3.6.0
IMAGE_NAME = apache/apisix
IMAGE_TAR_NAME = apache_apisix
diff --git a/centos/Dockerfile b/centos/Dockerfile
index e878424..dcc6312 100644
--- a/centos/Dockerfile
+++ b/centos/Dockerfile
@@ -17,7 +17,7 @@
FROM centos:7
-ARG APISIX_VERSION=3.5.0
+ARG APISIX_VERSION=3.6.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/debian/Dockerfile b/debian/Dockerfile
index 21397de..7ec76d1 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -17,7 +17,7 @@
FROM debian:bullseye-slim
-ARG APISIX_VERSION=3.5.0
+ARG APISIX_VERSION=3.6.0
RUN set -ex; \
arch=$(dpkg --print-architecture); \
diff --git a/docs/en/latest/build.md b/docs/en/latest/build.md
index 21450b8..41bd7b4 100644
--- a/docs/en/latest/build.md
+++ b/docs/en/latest/build.md
@@ -43,7 +43,7 @@ Find an APISIX [release
version](https://github.com/apache/apisix/releases) to b
Build a Docker image from the release:
```shell
-APISIX_VERSION=3.5.0 # specify release version
+APISIX_VERSION=3.6.0 # specify release version
DISTRO=debian # debian, centos, redhat
make build-on-$DISTRO
```
diff --git a/example/docker-compose-arm64.yml b/example/docker-compose-arm64.yml
index b7a266b..b9639fd 100644
--- a/example/docker-compose-arm64.yml
+++ b/example/docker-compose-arm64.yml
@@ -29,7 +29,7 @@ services:
apisix:
apisix:
- image: apache/apisix:3.5.0-debian
+ image: apache/apisix:3.6.0-debian
restart: always
volumes:
- ./apisix_conf/config.yaml:/usr/local/apisix/conf/config.yaml:ro
diff --git a/example/docker-compose-standalone.yml
b/example/docker-compose-standalone.yml
index 5f9dd59..3bbdd7b 100644
--- a/example/docker-compose-standalone.yml
+++ b/example/docker-compose-standalone.yml
@@ -19,7 +19,7 @@ version: "3"
services:
apisix:
- image: apache/apisix:${APISIX_IMAGE_TAG:-3.5.0-debian}
+ image: apache/apisix:${APISIX_IMAGE_TAG:-3.6.0-debian}
restart: always
volumes:
-
./apisix_conf/apisix-standalone.yaml:/usr/local/apisix/conf/apisix.yaml:ro
diff --git a/example/docker-compose.yml b/example/docker-compose.yml
index 1dc5e9d..0421e85 100644
--- a/example/docker-compose.yml
+++ b/example/docker-compose.yml
@@ -29,7 +29,7 @@ services:
apisix:
apisix:
- image: apache/apisix:${APISIX_IMAGE_TAG:-3.5.0-debian}
+ image: apache/apisix:${APISIX_IMAGE_TAG:-3.6.0-debian}
restart: always
volumes:
- ./apisix_conf/config.yaml:/usr/local/apisix/conf/config.yaml:ro
diff --git a/redhat/Dockerfile b/redhat/Dockerfile
index 8645ca4..614529f 100644
--- a/redhat/Dockerfile
+++ b/redhat/Dockerfile
@@ -17,7 +17,7 @@
FROM registry.access.redhat.com/ubi8/ubi:8.6
-ARG APISIX_VERSION=3.5.0
+ARG APISIX_VERSION=3.6.0
LABEL apisix_version="${APISIX_VERSION}"
COPY ./yum.repos.d/apache-apisix.repo /etc/yum.repos.d/apache-apisix.repo
COPY ./yum.repos.d/openresty.repo /etc/yum.repos.d/openresty.repo
