From cc24e51cd7a36678ef94d010d6c2d9e6e997a8aa Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Thu, 26 May 2022 00:25:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9workflow?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build_docker_image.yml |  7 +-----
 .github/workflows/docker.yml             | 31 ------------------------
 2 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 .github/workflows/docker.yml

diff --git a/.github/workflows/build_docker_image.yml b/.github/workflows/build_docker_image.yml
index 39d93461..9927beb5 100644
--- a/.github/workflows/build_docker_image.yml
+++ b/.github/workflows/build_docker_image.yml
@@ -21,14 +21,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2.2.1
-        with:
-          version: 7
-          run_install: false
       - uses: actions/setup-node@v3
 
       - name: build front and back
         run: |
+          npm i -g pnpm
           pnpm install
           pnpm build:front
           pnpm build:back
@@ -59,8 +56,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
-        with:
-          node-version: '14'
 
       - name: Set time zone
         uses: szenius/set-timezone@v1.0
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
deleted file mode 100644
index 0322c250..00000000
--- a/.github/workflows/docker.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: PublishDockerImage
-on:
-  workflow_dispatch:
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout base
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Docker login
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-        run: |
-          echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
-
-      - name: Docker buildx image and push on master branch
-        env:
-          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
-        run: |
-          docker buildx build --build-arg SSH_PRIVATE_KEY="${SSH_PRIVATE_KEY}" --output "type=image,push=true" --platform=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x --tag whyour/qinglong:latest docker/