This is an automated email from the ASF dual-hosted git repository.
membphis 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 71ff8f2 chore: modify apisix version to 2.2 & apisix-dashboard
version to 2.3 (#120)
71ff8f2 is described below
commit 71ff8f27fd0e684804d9c5ea656787d3cf217e7f
Author: kv <gxt...@163.com>
AuthorDate: Mon Jan 18 22:54:55 2021 +0800
chore: modify apisix version to 2.2 & apisix-dashboard version to 2.3 (#120)
---
README.md | 8 ++++----
alpine/Dockerfile | 2 +-
build.md | 4 ++--
example/docker-compose.yml | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index 2740113..f62f0d7 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,9 @@
1. install release version:
```
-# Assign Apache release version number to variable `APISIX_VERSION`, for
example: 2.1 . The latest version can be find at
`https://github.com/apache/apisix/releases`
+# Assign Apache release version number to variable `APISIX_VERSION`, for
example: 2.2 . The latest version can be find at
`https://github.com/apache/apisix/releases`
-export APISIX_VERSION=2.1
+export APISIX_VERSION=2.2
docker build -t apisix:${APISIX_VERSION}-alpine --build-arg
APISIX_VERSION=${APISIX_VERSION} -f alpine/Dockerfile alpine
```
@@ -52,10 +52,10 @@ $ docker run -v
`pwd`/all-in-one/apisix/config.yaml:/usr/local/apisix/conf/confi
* All in one Docker container for Apache apisix-dashboard
-**The latest version of `apisix-dashboard` is 2.1.1 and should be used with
APISIX 2.1. It is not recommended to use with other APISIX versions.**
+**The latest version of `apisix-dashboard` is 2.3 and should be used with
APISIX 2.2.**
```shell
-$ docker build --build-arg APISIX_VERSION=2.1 --build-arg
APISIX_DASHBOARD_VERSION=v2.1.1 -t apache/apisix-dashboard:whole -f
./all-in-one/apisix-dashboard/Dockerfile .
+$ docker build --build-arg APISIX_VERSION=2.2 --build-arg
APISIX_DASHBOARD_VERSION=v2.3 -t apache/apisix-dashboard:whole -f
./all-in-one/apisix-dashboard/Dockerfile .
$ docker run -v
`pwd`/all-in-one/apisix/config.yaml:/usr/local/apisix/conf/config.yaml -v
`pwd`/all-in-one/apisix-dashboard/conf.yaml:/usr/local/apisix-dashboard/conf/conf.yaml
-p 9080:9080 -p 2379:2379 -p 9000:9000 -d apache/apisix-dashboard:whole
```
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 51abb01..07af102 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -2,7 +2,7 @@ ARG ENABLE_PROXY=false
FROM openresty/openresty:alpine-fat AS production-stage
-ARG APISIX_VERSION=1.3
+ARG APISIX_VERSION=2.2
LABEL apisix_version="${APISIX_VERSION}"
ARG ENABLE_PROXY
diff --git a/build.md b/build.md
index 2a8e283..f4fe53a 100644
--- a/build.md
+++ b/build.md
@@ -4,9 +4,9 @@
1. install release version (Apache releases are beginning from version 0.9):
```
-# Assign Apache release version number to variable `APISIX_VERSION`, for
example: 1.2 . The latest version can be find at
`https://github.com/apache/apisix/releases`
+# Assign Apache release version number to variable `APISIX_VERSION`, for
example: 2.2 . The latest version can be find at
`https://github.com/apache/apisix/releases`
-APISIX_VERSION=1.2
+APISIX_VERSION=2.2
docker build -t apisix:${APISIX_VERSION}-alpine --build-arg
APISIX_VERSION=${APISIX_VERSION} -f alpine/Dockerfile alpine
```
diff --git a/example/docker-compose.yml b/example/docker-compose.yml
index 5334871..4bd338e 100644
--- a/example/docker-compose.yml
+++ b/example/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
services:
apisix:
- image: apache/apisix:2.1-alpine
+ image: apache/apisix:2.2-alpine
restart: always
volumes:
- ./apisix_log:/usr/local/apisix/logs
