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/06/25 19:21:25 UTC

[apisix-docker] branch release/apisix-2.7 updated (5edb313 -> 42a986b)

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

shuyangw pushed a change to branch release/apisix-2.7
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git.


    from 5edb313  feat: trigger docker push
     new aee5712  fix docker login
     add d386ae7  feat: upgrade APISIX to 2.7 (#188)
     new 42a986b  Merge branch 'master' of https://github.com/apache/apisix-docker into release/apisix-2.7

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/apisix-docker-test.yaml        | 2 +-
 .github/workflows/apisix_push_docker_hub.yaml    | 2 +-
 .github/workflows/dashboard_push_docker_hub.yaml | 2 +-
 Makefile                                         | 2 +-
 alpine/Dockerfile                                | 2 +-
 centos/Dockerfile                                | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

[apisix-docker] 01/02: fix docker login

Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

shuyangw pushed a commit to branch release/apisix-2.7
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git

commit aee5712f713095f28e7e3f593fac1dd16b6993a2
Author: yiyiyimu <wo...@gmail.com>
AuthorDate: Fri Jun 25 15:20:52 2021 -0400

    fix docker login
    
    Signed-off-by: yiyiyimu <wo...@gmail.com>
---
 .github/workflows/apisix_push_docker_hub.yaml    | 2 +-
 .github/workflows/dashboard_push_docker_hub.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/apisix_push_docker_hub.yaml b/.github/workflows/apisix_push_docker_hub.yaml
index faa5925..479978f 100644
--- a/.github/workflows/apisix_push_docker_hub.yaml
+++ b/.github/workflows/apisix_push_docker_hub.yaml
@@ -16,7 +16,7 @@ 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:
diff --git a/.github/workflows/dashboard_push_docker_hub.yaml b/.github/workflows/dashboard_push_docker_hub.yaml
index 87d2a0c..72764fd 100644
--- a/.github/workflows/dashboard_push_docker_hub.yaml
+++ b/.github/workflows/dashboard_push_docker_hub.yaml
@@ -11,7 +11,7 @@ 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:

[apisix-docker] 02/02: Merge branch 'master' of https://github.com/apache/apisix-docker into release/apisix-2.7

Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

shuyangw pushed a commit to branch release/apisix-2.7
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git

commit 42a986bb2a365c39ecb32376bc84a0933c7f49bc
Merge: aee5712 d386ae7
Author: yiyiyimu <wo...@gmail.com>
AuthorDate: Fri Jun 25 15:20:54 2021 -0400

    Merge branch 'master' of https://github.com/apache/apisix-docker into release/apisix-2.7

 .github/workflows/apisix-docker-test.yaml | 2 +-
 Makefile                                  | 2 +-
 alpine/Dockerfile                         | 2 +-
 centos/Dockerfile                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)