From c64221b5aed26c61729a32be3ee1a40b799fbb52 Mon Sep 17 00:00:00 2001
From: dec0dOS <alex.potapov21@gmail.com>
Date: Mon, 22 Mar 2021 22:45:31 +0300
Subject: [PATCH] ci: small update

---
 .github/workflows/main.yml | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9221805..1e1937a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -24,19 +24,6 @@ jobs:
             TAGS="$TAGS,${DOCKER_IMAGE}:latest"
           fi
           echo ::set-output name=tags::${TAGS}
-      - name: Prepare zerotier-controller
-        id: prep_zerotier-controller
-        run: |
-          DOCKER_IMAGE=${{ secrets.DOCKER_HUB_USERNAME }}/zerotier-controller
-          VERSION=edge
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            VERSION=${GITHUB_REF#refs/tags/v}
-          fi
-          TAGS="${DOCKER_IMAGE}:${VERSION}"
-          if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
-            TAGS="$TAGS,${DOCKER_IMAGE}:latest"
-          fi
-          echo ::set-output name=tags::${TAGS}
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v1
@@ -62,7 +49,7 @@ jobs:
           tags: ${{ steps.prep_zero-ui.outputs.tags }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
-      - name: Build and push
+      - name: Build and push zerotier-controller
         id: docker_build_zerotier-controller
         uses: docker/build-push-action@v2
         with:
@@ -70,6 +57,6 @@ jobs:
           file: ./docker/zerotier/Dockerfile
           builder: ${{ steps.buildx.outputs.name }}
           push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.prep_zerotier-controller.outputs.tags }}
+          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/zerotier-controller:latest
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache