You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by kv...@apache.org on 2021/07/13 04:19:30 UTC

[apisix-docker] branch master updated: ci: fix actions in docker push (#191)

This is an automated email from the ASF dual-hosted git repository.

kvn 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 054c028  ci: fix actions in docker push (#191)
054c028 is described below

commit 054c0284225482de55a8a7e913816c0dc9bb969e
Author: Shuyang Wu <wo...@gmail.com>
AuthorDate: Tue Jul 13 00:19:20 2021 -0400

    ci: fix actions in docker push (#191)
    
    Signed-off-by: yiyiyimu <wo...@gmail.com>
---
 .github/workflows/apisix_push_docker_hub.yaml    | 4 ++--
 .github/workflows/dashboard_push_docker_hub.yaml | 4 ++--
 example/apisix_conf/config.yaml                  | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/apisix_push_docker_hub.yaml b/.github/workflows/apisix_push_docker_hub.yaml
index faa5925..1a1a0e5 100644
--- a/.github/workflows/apisix_push_docker_hub.yaml
+++ b/.github/workflows/apisix_push_docker_hub.yaml
@@ -16,9 +16,9 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Login
-        run: echo ${{ secrets.DOCKER_PASSWORD }} | docker login --username=${{ secrets.DOCKER_USERNAME }} --password-stdin
+        run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login --username=${{ secrets.DOCKERHUB_USER }} --password-stdin
 
       - name: Push apisix image to Docker Hub
-        run:
+        run: |
           make build-on-${{ matrix.platform }}
           make push-on-${{ matrix.platform }}
diff --git a/.github/workflows/dashboard_push_docker_hub.yaml b/.github/workflows/dashboard_push_docker_hub.yaml
index 87d2a0c..7a71292 100644
--- a/.github/workflows/dashboard_push_docker_hub.yaml
+++ b/.github/workflows/dashboard_push_docker_hub.yaml
@@ -11,9 +11,9 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Login
-        run: echo ${{ secrets.DOCKER_PASSWORD }} | docker login --username=${{ secrets.DOCKER_USERNAME }} --password-stdin
+        run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login --username=${{ secrets.DOCKERHUB_USER }} --password-stdin
 
       - name: Push apisix dashboard image to Docker Hub
-        run:
+        run: |
           make build-on-dashboard
           make push-on-dashboard
diff --git a/example/apisix_conf/config.yaml b/example/apisix_conf/config.yaml
index fc22e1b..663e37d 100644
--- a/example/apisix_conf/config.yaml
+++ b/example/apisix_conf/config.yaml
@@ -19,4 +19,3 @@ etcd:
     - "http://etcd:2379"     # multiple etcd address
   prefix: "/apisix"               # apisix configurations prefix
   timeout: 30                     # 30 seconds
-