This is an automated email from the ASF dual-hosted git repository.
juzhiyuan 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 f03776f feat: release APISIX Dashboard 2.7.1 (#207)
f03776f is described below
commit f03776f913621f90f095f72cdbfd9bb05a30ae19
Author: nic-chen <[email protected]>
AuthorDate: Thu Aug 19 16:35:22 2021 +0800
feat: release APISIX Dashboard 2.7.1 (#207)
---
.github/workflows/apisix_push_docker_hub.yaml | 7 +++++--
.github/workflows/dashboard-docker-test.yaml | 2 +-
.github/workflows/dashboard_push_docker_hub.yaml | 13 ++++++++-----
Makefile | 2 +-
dashboard/Dockerfile | 2 +-
5 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/apisix_push_docker_hub.yaml
b/.github/workflows/apisix_push_docker_hub.yaml
index aee1cf0..3096e25 100644
--- a/.github/workflows/apisix_push_docker_hub.yaml
+++ b/.github/workflows/apisix_push_docker_hub.yaml
@@ -10,8 +10,11 @@ jobs:
- name: Check out the repo
uses: actions/checkout@v2
- - name: Login
- run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login --username=${{
secrets.DOCKERHUB_USER }} --password-stdin
+ - name: Login to Docker Hub
+ uses: docker/login-action@v1
+ with:
+ username: ${{ secrets.DOCKERHUB_USER }}
+ password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/dashboard-docker-test.yaml
b/.github/workflows/dashboard-docker-test.yaml
index 30bf838..3326d03 100644
--- a/.github/workflows/dashboard-docker-test.yaml
+++ b/.github/workflows/dashboard-docker-test.yaml
@@ -13,7 +13,7 @@ jobs:
name: build dashboard & test
runs-on: ubuntu-latest
env:
- APISIX_DASHBOARD_TAG: 2.7
+ APISIX_DASHBOARD_TAG: 2.7.1
steps:
- name: Checkout
uses: actions/checkout@v2
diff --git a/.github/workflows/dashboard_push_docker_hub.yaml
b/.github/workflows/dashboard_push_docker_hub.yaml
index 7a71292..3cbe819 100644
--- a/.github/workflows/dashboard_push_docker_hub.yaml
+++ b/.github/workflows/dashboard_push_docker_hub.yaml
@@ -1,7 +1,7 @@
name: Push apisix dashboard to Docker image
on:
push:
- branches: ['release/dashboard**']
+ branches: []
jobs:
build:
runs-on: ubuntu-latest
@@ -10,10 +10,13 @@ jobs:
- name: Check out the repo
uses: actions/checkout@v2
- - name: Login
- run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login --username=${{
secrets.DOCKERHUB_USER }} --password-stdin
+ - name: Login to Docker Hub
+ uses: docker/login-action@v1
+ with:
+ username: ${{ secrets.DOCKERHUB_USER }}
+ password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Push apisix dashboard image to Docker Hub
run: |
- make build-on-dashboard
- make push-on-dashboard
+ make build-dashboard
+ make push-dashboard
diff --git a/Makefile b/Makefile
index 105a79b..4de3cbb 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ APISIX_VERSION ?= 2.8
IMAGE_NAME = apache/apisix
IMAGE_TAR_NAME = apache_apisix
-APISIX_DASHBOARD_VERSION ?= 2.7
+APISIX_DASHBOARD_VERSION ?= 2.7.1
APISIX_DASHBOARD_IMAGE_NAME = apache/apisix-dashboard
APISIX_DASHBOARD_IMAGE_TAR_NAME = apache_apisix_dashboard
diff --git a/dashboard/Dockerfile b/dashboard/Dockerfile
index 4b4af07..440299a 100644
--- a/dashboard/Dockerfile
+++ b/dashboard/Dockerfile
@@ -16,7 +16,7 @@
#
FROM alpine:latest as pre-build
-ARG APISIX_DASHBOARD_VERSION=release/2.7
+ARG APISIX_DASHBOARD_VERSION=release/2.7.1
RUN set -x \
&& apk add --no-cache --virtual .builddeps git \
