You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by sh...@apache.org on 2021/07/13 03:51:12 UTC
[apisix-docker] branch ci/release-on-multiarch updated: add for
dashboard
This is an automated email from the ASF dual-hosted git repository.
shuyangw pushed a commit to branch ci/release-on-multiarch
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git
The following commit(s) were added to refs/heads/ci/release-on-multiarch by this push:
new 831cbee add for dashboard
831cbee is described below
commit 831cbeea8c1037608aa90048722e31f318baa2ea
Author: yiyiyimu <wo...@gmail.com>
AuthorDate: Mon Jul 12 23:51:01 2021 -0400
add for dashboard
Signed-off-by: yiyiyimu <wo...@gmail.com>
---
.github/workflows/dashboard_push_docker_hub.yaml | 8 ++++++--
Makefile | 19 ++++++++++++-------
2 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/dashboard_push_docker_hub.yaml b/.github/workflows/dashboard_push_docker_hub.yaml
index 87d2a0c..169c75d 100644
--- a/.github/workflows/dashboard_push_docker_hub.yaml
+++ b/.github/workflows/dashboard_push_docker_hub.yaml
@@ -13,7 +13,11 @@ jobs:
- name: Login
run: echo ${{ secrets.DOCKER_PASSWORD }} | docker login --username=${{ secrets.DOCKER_USERNAME }} --password-stdin
+ - name: Set up Docker Buildx
+ id: buildx
+ uses: docker/setup-buildx-action@v1
+
- name: Push apisix dashboard image to Docker Hub
run:
- make build-on-dashboard
- make push-on-dashboard
+ make push-multiarch-dashboard
+
diff --git a/Makefile b/Makefile
index 94d091c..60b22ab 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ build-on-alpine:
build-on-alpine-local:
docker build -t $(IMAGE_NAME):$(APISIX_VERSION)-alpine-local --build-arg APISIX_PATH=${APISIX_PATH} -f ./alpine-local/Dockerfile .
-### push-on-centos: Push apache/apisix:xx-centos image
+### push-multiarch-on-centos: Push apache/apisix:xx-centos image
push-multiarch-on-centos:
docker buildx build --push \
-t $(IMAGE_NAME):$(APISIX_VERSION)-centos \
@@ -49,7 +49,7 @@ push-multiarch-on-centos:
--platform linux/amd64,linux/arm64 \
-f ./centos/Dockerfile .
-### push-on-alpine: Push apache/apisix:xx-alpine image
+### push-multiarch-on-alpine: Push apache/apisix:xx-alpine image
push-multiarch-on-alpine:
docker buildx build --push \
-t $(IMAGE_NAME):$(APISIX_VERSION)-alpine \
@@ -78,11 +78,16 @@ save-alpine-tar:
build-dashboard:
docker build -t $(APISIX_DASHBOARD_IMAGE_NAME):$(APISIX_DASHBOARD_VERSION) -f ./dashboard/Dockerfile .
-### push-dashboard: Push apache/dashboard:tag image
-push-dashboard:
- docker push $(APISIX_DASHBOARD_IMAGE_NAME):$(APISIX_DASHBOARD_VERSION)
- docker build -t $(APISIX_DASHBOARD_IMAGE_NAME):latest -f ./dashboard/Dockerfile .
- docker push $(APISIX_DASHBOARD_IMAGE_NAME):latest
+### push-multiarch-dashboard: Push apache/dashboard:tag image
+push-multiarch-dashboard:
+ docker buildx build --push \
+ -t $(APISIX_DASHBOARD_IMAGE_NAME):$(APISIX_DASHBOARD_VERSION) \
+ --platform linux/amd64,linux/arm64 \
+ -f ./dashboard/Dockerfile .
+ docker buildx build --push \
+ -t $(APISIX_DASHBOARD_IMAGE_NAME):latest \
+ --platform linux/amd64,linux/arm64 \
+ -f ./dashboard/Dockerfile .
### save-dashboard-tar: tar apache/apisix-dashboard:tag image
save-dashboard-tar: