From faecfe827b951bc77e890e6f6a0a00e2a7bf235f Mon Sep 17 00:00:00 2001
From: Mayank <mayankchhabra9@gmail.com>
Date: Mon, 1 Jun 2020 08:21:51 +0530
Subject: [PATCH] Push workflow

---
 .github/workflows/on-tag.yml | 29 +++++++++++------------------
 README.md                    |  2 +-
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml
index 4195758..e34f410 100644
--- a/.github/workflows/on-tag.yml
+++ b/.github/workflows/on-tag.yml
@@ -1,28 +1,21 @@
-name: Automatically Build image on tag
+name: Docker build on tag
 env:
         DOCKER_CLI_EXPERIMENTAL: enabled
         TAG_FMT: '^refs/tags/(((.?[0-9]+){3,4}))$'
 
 on:
         push:
-                tags: [ '*' ]
+                tags:
+                  - v[0-9]+.[0-9]+.[0-9]+
+                  - v[0-9]+.[0-9]+.[0-9]+-*
 
 jobs:
         build:
                 runs-on: ubuntu-18.04
-                name: Build / Push Umbrel Manager on version tag
+                name: Build and push manager image
                 steps:
-                        - name: Setup Environment
-                          run: |
-                                  if ! echo "$GITHUB_REF" | grep -qE "$TAG_FMT"; then
-                                        echo "ERR: TAG must be in format: vX.Y.Z or X.Y.Z or vW.X.Y.Z or W.X.Y.Z"
-                                        exit 1
-                                  fi
-                                  VERSION="$(echo "$GITHUB_REF" | sed -E "s|$TAG_FMT|\2|")"
-                                  
-                                  TAG="$(echo "$GITHUB_REF" | sed -E "s|$TAG_FMT|\1|")"
-                                  echo ::set-env name=TAG::"$TAG"
-                                  
+                        - name: Set env variables
+                          run: echo ::set-env name=TAG::${GITHUB_REF/refs\/tags\//}   
                         - name: Show set environment variables
                           run: |
                                   printf "    TAG: %s\n"  "$TAG"                                  
@@ -41,14 +34,14 @@ jobs:
                         - name: Run Docker build X (against tag)
                           run: |
                                   docker buildx build \
-                                  --platform linux/amd64,linux/386,linux/arm/v7,linux/arm64 \
-                                  -t getumbrel/manager:$TAG \
+                                  --platform linux/amd64,linux/arm/v7 \
+                                  -t ${{ secrets.DOCKER_HUB_USER }}/manager:$TAG \
                                   --output "type=registry" \
                                   .
                         - name: Run Docker build X (against latest)
                           run: |
                                   docker buildx build \
-                                  --platform linux/amd64,linux/386,linux/arm/v7,linux/arm64 \
-                                  -t getumbrel/manager:latest \
+                                  --platform linux/amd64,linux/arm/v7 \
+                                  -t ${{ secrets.DOCKER_HUB_USER }}/manager:latest \
                                   --output "type=registry" \
                                   .
diff --git a/README.md b/README.md
index 4af0eed..fe101c8 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Umbrel Manager](https://static.getumbrel.com/github/github-banner-umbrel-manager.svg)](https://github.com/getumbrel/umbrel-manager)
 
 [![Version](https://img.shields.io/github/v/release/getumbrel/umbrel-manager?color=%235351FB&label=version)](https://github.com/getumbrel/umbrel-manager/releases)
-[![Docker Build](https://img.shields.io/github/workflow/status/getumbrel/umbrel-manager/Automatically%20Build%20image%20on%20tag?color=%235351FB)](https://github.com/getumbrel/umbrel-manager/actions?query=workflow%3A"Automatically+Build+image+on+tag")
+[![Docker Build](https://img.shields.io/github/workflow/status/getumbrel/umbrel-manager/Docker%20build%20on%20push?color=%235351FB)](https://github.com/getumbrel/umbrel-manager/actions?query=workflow%3A"Docker+build+on+push")
 [![Docker Pulls](https://img.shields.io/docker/pulls/getumbrel/manager?color=%235351FB)](https://hub.docker.com/repository/registry-1.docker.io/getumbrel/manager/tags?page=1)
 [![Chat](https://img.shields.io/badge/chat%20on-telegram-%235351FB)](https://t.me/getumbrel)