This is an automated email from the ASF dual-hosted git repository.
bzp2010 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 d2ea37a feat: bump APISIX Dashboard to 2.13.1 (#384)
d2ea37a is described below
commit d2ea37a2a75556ead74d6fe648fbe22bf09b0a9b
Author: Zeping Bai <[email protected]>
AuthorDate: Fri Nov 25 17:11:18 2022 +0800
feat: bump APISIX Dashboard to 2.13.1 (#384)
---
.github/workflows/dashboard_all_in_one_ci.yaml | 6 +++++-
.github/workflows/dashboard_push_docker_hub.yaml | 2 +-
Makefile | 2 +-
example/docker-compose-arm64.yml | 2 +-
example/docker-compose.yml | 2 +-
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/dashboard_all_in_one_ci.yaml
b/.github/workflows/dashboard_all_in_one_ci.yaml
index 4bfb7af..0aa8b08 100644
--- a/.github/workflows/dashboard_all_in_one_ci.yaml
+++ b/.github/workflows/dashboard_all_in_one_ci.yaml
@@ -11,12 +11,16 @@ on:
jobs:
build:
runs-on: ubuntu-latest
+
+ env:
+ APISIX_DASHBOARD_BRANCH: "2.13.1" # GitHub release tag id
+
steps:
- uses: actions/checkout@v2
- name: Build and Test
run: |
- docker build -t apache/apisix-dashboard:whole -f
./all-in-one/apisix-dashboard/Dockerfile .
+ docker build -t apache/apisix-dashboard:whole --build-arg
APISIX_DASHBOARD_VERSION=v${APISIX_DASHBOARD_BRANCH} -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
sleep 30
curl http://127.0.0.1:9080/apisix/admin/schema/service -H
'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1'
diff --git a/.github/workflows/dashboard_push_docker_hub.yaml
b/.github/workflows/dashboard_push_docker_hub.yaml
index 6f2716a..73c6e51 100644
--- a/.github/workflows/dashboard_push_docker_hub.yaml
+++ b/.github/workflows/dashboard_push_docker_hub.yaml
@@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
env:
- APISIX_DASHBOARD_TAG: "2.13"
+ APISIX_DASHBOARD_TAG: "2.13.1"
steps:
- name: Check out the repo
diff --git a/Makefile b/Makefile
index 38bf594..96fa7f1 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ MAX_APISIX_VERSION ?= 3.0.0
IMAGE_NAME = apache/apisix
IMAGE_TAR_NAME = apache_apisix
-APISIX_DASHBOARD_VERSION ?= 2.13
+APISIX_DASHBOARD_VERSION ?= 2.13.1
APISIX_DASHBOARD_IMAGE_NAME = apache/apisix-dashboard
APISIX_DASHBOARD_IMAGE_TAR_NAME = apache_apisix_dashboard
diff --git a/example/docker-compose-arm64.yml b/example/docker-compose-arm64.yml
index b18e6fa..7e2a6f3 100644
--- a/example/docker-compose-arm64.yml
+++ b/example/docker-compose-arm64.yml
@@ -19,7 +19,7 @@ version: "3"
services:
apisix-dashboard:
- image: apache/apisix-dashboard:2.13-alpine
+ image: apache/apisix-dashboard:2.13.1-alpine
restart: always
volumes:
- ./dashboard_conf/conf.yaml:/usr/local/apisix-dashboard/conf/conf.yaml
diff --git a/example/docker-compose.yml b/example/docker-compose.yml
index 3247a2a..fcc3331 100644
--- a/example/docker-compose.yml
+++ b/example/docker-compose.yml
@@ -19,7 +19,7 @@ version: "3"
services:
apisix-dashboard:
- image: apache/apisix-dashboard:2.13-alpine
+ image: apache/apisix-dashboard:2.13.1-alpine
restart: always
volumes:
- ./dashboard_conf/conf.yaml:/usr/local/apisix-dashboard/conf/conf.yaml
