From 9f1f12ad9ed0d200203c2920f61a62486a81553a Mon Sep 17 00:00:00 2001 From: Erope Date: Sun, 11 Apr 2021 20:13:34 +0800 Subject: [PATCH 1/8] =?UTF-8?q?Action=E6=8E=A8=E9=80=81=E5=88=B0=E9=98=BF?= =?UTF-8?q?=E9=87=8C=E4=BA=91=E4=B8=8A=E6=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dashboard.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dashboard.yml b/.github/workflows/dashboard.yml index 5bbcb215..bb06dbda 100644 --- a/.github/workflows/dashboard.yml +++ b/.github/workflows/dashboard.yml @@ -18,12 +18,20 @@ jobs: - uses: actions/checkout@master - name: Log into registry - run: echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin + run: + echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin + echo "${{ secrets.ALI_PAT }}" | docker login registry.cn-shanghai.aliyuncs.com -u ${{ secrets.ALI_USER }} --password-stdin - - name: Build and push dasbboard image + - name: Build dasbboard image run: | go env go test -v ./... - IMAGE_NAME=$(echo "ghcr.io/${{ github.repository_owner }}/nezha-dashboard" | tr '[:upper:]' '[:lower:]') - docker build -t $IMAGE_NAME -f Dockerfile . - docker push $IMAGE_NAME + docker build -t nezha-dasbboard -f Dockerfile . + - name: Push dasbboard image + run: | + GHRC_IMAGE_NAME=$(echo "ghcr.io/${{ github.repository_owner }}/nezha-dashboard" | tr '[:upper:]' '[:lower:]') + ALI_IMAGE_NAME=$(echo "registry.cn-shanghai.aliyuncs.com/${{ github.repository_owner }}/nezha-dashboard" | tr '[:upper:]' '[:lower:]') + docker tag nezha-dasbboard $GHRC_IMAGE_NAME + docker tag nezha-dasbboard $ALI_IMAGE_NAME + docker push $GHRC_IMAGE_NAME + docker push $ALI_IMAGE_NAME From 3c8df84f6c24ffcbf4542f730e2bfb375df1b96e Mon Sep 17 00:00:00 2001 From: Erope Date: Sun, 11 Apr 2021 20:14:47 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=B0=91=E4=BA=86=E4=B8=AA=E7=AC=A6?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dashboard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dashboard.yml b/.github/workflows/dashboard.yml index bb06dbda..ee5e2f6c 100644 --- a/.github/workflows/dashboard.yml +++ b/.github/workflows/dashboard.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@master - name: Log into registry - run: + run: | echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin echo "${{ secrets.ALI_PAT }}" | docker login registry.cn-shanghai.aliyuncs.com -u ${{ secrets.ALI_USER }} --password-stdin From dfd060e378fb99bceef7520f6b170a526a8292d2 Mon Sep 17 00:00:00 2001 From: Erope Date: Sun, 11 Apr 2021 20:41:14 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/docker-compose.yaml | 2 +- script/install.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/script/docker-compose.yaml b/script/docker-compose.yaml index 856b02f9..a7ec1165 100644 --- a/script/docker-compose.yaml +++ b/script/docker-compose.yaml @@ -2,7 +2,7 @@ version: "3.3" services: dashboard: - image: ghcr.io/naiba/nezha-dashboard + image: image_url restart: always volumes: - ./data:/dashboard/data diff --git a/script/install.sh b/script/install.sh index aec2ab67..1e7bb41f 100755 --- a/script/install.sh +++ b/script/install.sh @@ -67,11 +67,13 @@ pre_check() { GITHUB_URL="github.com" Get_Docker_URL="get.docker.com" Get_Docker_Argu=" " + Docker_IMG="ghcr.io/naiba/nezha-dashboard" else GITHUB_RAW_URL="cdn.jsdelivr.net/gh/naiba/nezha@master" GITHUB_URL="dn-dao-github-mirror.daocloud.io" Get_Docker_URL="get.daocloud.io/docker" Get_Docker_Argu=" -s docker --mirror Aliyun" + Docker_IMG="registry.cn-shanghai.aliyuncs.com/erope/nezha-dashboard" fi } @@ -264,6 +266,7 @@ modify_dashboard_config() { sed -i "s/nz_site_title/${nz_site_title}/" ${NZ_DASHBOARD_PATH}/data/config.yaml sed -i "s/nz_site_port/${nz_site_port}/" ${NZ_DASHBOARD_PATH}/docker-compose.yaml sed -i "s/nz_grpc_port/${nz_grpc_port}/" ${NZ_DASHBOARD_PATH}/docker-compose.yaml + sed -i "s/image_url/${Docker_IMG}/" ${NZ_DASHBOARD_PATH}/docker-compose.yaml echo -e "面板配置 ${green}修改成功，请稍等重启生效${plain}" From b44ccc19b07c671b30d864bb5468b232f1a8e725 Mon Sep 17 00:00:00 2001 From: Erope Date: Sun, 11 Apr 2021 20:47:33 +0800 Subject: [PATCH 4/8] =?UTF-8?q?Action=E5=8A=A0=E5=85=A5=E5=88=B7=E6=96=B0j?= =?UTF-8?q?sdelivr=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dashboard.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/dashboard.yml b/.github/workflows/dashboard.yml index ee5e2f6c..c1e918ac 100644 --- a/.github/workflows/dashboard.yml +++ b/.github/workflows/dashboard.yml @@ -35,3 +35,9 @@ jobs: docker tag nezha-dasbboard $ALI_IMAGE_NAME docker push $GHRC_IMAGE_NAME docker push $ALI_IMAGE_NAME + - name: Purge jsdelivr cache + run: | + curl https://purge.jsdelivr.net/gh/${{ github.repository_owner }}/nezha@master/script/install.sh + curl https://purge.jsdelivr.net/gh/${{ github.repository_owner }}/nezha@master/script/nezha-agent.service + curl https://purge.jsdelivr.net/gh/${{ github.repository_owner }}/nezha@master/script/docker-compose.yaml + curl https://purge.jsdelivr.net/gh/${{ github.repository_owner }}/nezha@master/script/config.yaml From f0e2ef68dc36d72f46a7791fd5b2f0c0c6b5ad52 Mon Sep 17 00:00:00 2001 From: Erope Date: Sun, 11 Apr 2021 20:59:58 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=98=BF=E9=87=8CDocker?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=9C=B0=E5=9D=80=E4=B8=BAnaiba?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/install.sh b/script/install.sh index 1e7bb41f..dbb6a614 100755 --- a/script/install.sh +++ b/script/install.sh @@ -73,7 +73,7 @@ pre_check() { GITHUB_URL="dn-dao-github-mirror.daocloud.io" Get_Docker_URL="get.daocloud.io/docker" Get_Docker_Argu=" -s docker --mirror Aliyun" - Docker_IMG="registry.cn-shanghai.aliyuncs.com/erope/nezha-dashboard" + Docker_IMG="registry.cn-shanghai.aliyuncs.com/naiba/nezha-dashboard" fi } From 85e32ed639d73bcfaeee4d9e0ba15fc697a92df1 Mon Sep 17 00:00:00 2001 From: Erope Date: Sun, 11 Apr 2021 21:03:34 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=B0=8F=E5=86=99?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8DJSDELIVER=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dashboard.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dashboard.yml b/.github/workflows/dashboard.yml index c1e918ac..05540e0f 100644 --- a/.github/workflows/dashboard.yml +++ b/.github/workflows/dashboard.yml @@ -37,7 +37,12 @@ jobs: docker push $ALI_IMAGE_NAME - name: Purge jsdelivr cache run: | - curl https://purge.jsdelivr.net/gh/${{ github.repository_owner }}/nezha@master/script/install.sh - curl https://purge.jsdelivr.net/gh/${{ github.repository_owner }}/nezha@master/script/nezha-agent.service - curl https://purge.jsdelivr.net/gh/${{ github.repository_owner }}/nezha@master/script/docker-compose.yaml - curl https://purge.jsdelivr.net/gh/${{ github.repository_owner }}/nezha@master/script/config.yaml + curl -s https://purge.jsdelivr.net/gh/${{ github.repository_owner }}/nezha@master/script/install.sh + curl -s https://purge.jsdelivr.net/gh/${{ github.repository_owner }}/nezha@master/script/nezha-agent.service + curl -s https://purge.jsdelivr.net/gh/${{ github.repository_owner }}/nezha@master/script/docker-compose.yaml + curl -s https://purge.jsdelivr.net/gh/${{ github.repository_owner }}/nezha@master/script/config.yaml + LOWER_USERNAME=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]') + curl -s https://purge.jsdelivr.net/gh/$LOWER_USERNAME/nezha@master/script/install.sh + curl -s https://purge.jsdelivr.net/gh/$LOWER_USERNAME/nezha@master/script/nezha-agent.service + curl -s https://purge.jsdelivr.net/gh/$LOWER_USERNAME/nezha@master/script/docker-compose.yaml + curl -s https://purge.jsdelivr.net/gh/$LOWER_USERNAME/nezha@master/script/config.yaml From e17d0b65f5019021ccbfa985bc85f4e12524adc9 Mon Sep 17 00:00:00 2001 From: Erope Date: Sun, 11 Apr 2021 21:13:25 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=BD=AC=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/install.sh b/script/install.sh index dbb6a614..303e0884 100755 --- a/script/install.sh +++ b/script/install.sh @@ -67,13 +67,13 @@ pre_check() { GITHUB_URL="github.com" Get_Docker_URL="get.docker.com" Get_Docker_Argu=" " - Docker_IMG="ghcr.io/naiba/nezha-dashboard" + Docker_IMG="ghcr.io\/naiba\/nezha-dashboard" else GITHUB_RAW_URL="cdn.jsdelivr.net/gh/naiba/nezha@master" GITHUB_URL="dn-dao-github-mirror.daocloud.io" Get_Docker_URL="get.daocloud.io/docker" Get_Docker_Argu=" -s docker --mirror Aliyun" - Docker_IMG="registry.cn-shanghai.aliyuncs.com/naiba/nezha-dashboard" + Docker_IMG="registry.cn-shanghai.aliyuncs.com\/naiba\/nezha-dashboard" fi } From 6308cd3689d5b092f954c7ee812b95d71354b4f8 Mon Sep 17 00:00:00 2001 From: Erope Date: Sun, 11 Apr 2021 21:59:33 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=AF=B9naiba=E5=81=9A=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dashboard.yml | 5 ++++- script/install.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dashboard.yml b/.github/workflows/dashboard.yml index 05540e0f..cc281052 100644 --- a/.github/workflows/dashboard.yml +++ b/.github/workflows/dashboard.yml @@ -30,7 +30,10 @@ jobs: - name: Push dasbboard image run: | GHRC_IMAGE_NAME=$(echo "ghcr.io/${{ github.repository_owner }}/nezha-dashboard" | tr '[:upper:]' '[:lower:]') - ALI_IMAGE_NAME=$(echo "registry.cn-shanghai.aliyuncs.com/${{ github.repository_owner }}/nezha-dashboard" | tr '[:upper:]' '[:lower:]') + if [ ${{ github.repository_owner }} = "naiba" ] + then ALI_IMAGE_NAME=$(echo "registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard") + else ALI_IMAGE_NAME=$(echo "registry.cn-shanghai.aliyuncs.com/${{ github.repository_owner }}/nezha-dashboard" | tr '[:upper:]' '[:lower:]') + fi docker tag nezha-dasbboard $GHRC_IMAGE_NAME docker tag nezha-dasbboard $ALI_IMAGE_NAME docker push $GHRC_IMAGE_NAME diff --git a/script/install.sh b/script/install.sh index 303e0884..65e45d4e 100755 --- a/script/install.sh +++ b/script/install.sh @@ -73,7 +73,7 @@ pre_check() { GITHUB_URL="dn-dao-github-mirror.daocloud.io" Get_Docker_URL="get.daocloud.io/docker" Get_Docker_Argu=" -s docker --mirror Aliyun" - Docker_IMG="registry.cn-shanghai.aliyuncs.com\/naiba\/nezha-dashboard" + Docker_IMG="registry.cn-shanghai.aliyuncs.com\/naibahq\/nezha-dashboard" fi }