From 663b0577f2acba5f95cb4e4dedd0e22483feef36 Mon Sep 17 00:00:00 2001 From: mzz2017 Date: Thu, 16 Sep 2021 13:12:03 +0800 Subject: [PATCH] chore: correct docker image tag --- .github/workflows/dockerimage.yml | 2 +- .github/workflows/dockerimage_gui.yml | 19 ++----------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 848810fc..eddc7cc5 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -17,7 +17,7 @@ jobs: TAG=$(echo $GITHUB_REF | cut -d / -f 3) IMAGE="mzz2017/v2raya" echo ::set-output name=image::${IMAGE} - echo ::set-output name=tag::${TAG} + echo ::set-output name=tag::${TAG:1} - name: Set up QEMU uses: docker/setup-qemu-action@v1 diff --git a/.github/workflows/dockerimage_gui.yml b/.github/workflows/dockerimage_gui.yml index 5d29fc44..434a0e0b 100644 --- a/.github/workflows/dockerimage_gui.yml +++ b/.github/workflows/dockerimage_gui.yml @@ -16,14 +16,6 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Cache Docker layers - uses: actions/cache@v2 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-single-buildx-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-single-buildx - - name: Login to DockerHub uses: docker/login-action@v1 with: @@ -38,12 +30,5 @@ jobs: platforms: linux/arm,linux/arm64,linux/amd64 push: true tags: mzz2017/v2raya-gui:latest - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache-new - # Temp fix - # https://github.com/docker/build-push-action/issues/252 - # https://github.com/moby/buildkit/issues/1896 - - name: Move cache - run: | - rm -rf /tmp/.buildx-cache - mv /tmp/.buildx-cache-new /tmp/.buildx-cache \ No newline at end of file + cache-from: type=gha + cache-to: type=gha,mode=max \ No newline at end of file