From bb3c44acbca30d6949a6378269099d95acaae955 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 1 Nov 2023 00:36:38 -0700
Subject: [PATCH] ci: combine workflows

---
 .github/workflows/docker-build.yml | 42 ------------------------------
 .github/workflows/release.yml      | 36 +++++++++++++++++++++++++
 main.go                            |  2 +-
 3 files changed, 37 insertions(+), 43 deletions(-)
 delete mode 100644 .github/workflows/docker-build.yml

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
deleted file mode 100644
index e2e37ef9..00000000
--- a/.github/workflows/docker-build.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: Docker Build and Publish
-
-on:
-  workflow_dispatch:
-    inputs:
-      tagName:
-        description: "Tag name"
-        required: true
-        default: 'v1'
-
-jobs:
-  push_to_registry:
-    runs-on: ubuntu-latest
-
-    name: Build docker image and push to dockerhub
-
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build container image
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          platforms: linux/amd64,linux/arm64
-          context: './'
-          no-cache: true
-          file: 'Dockerfile'
-          tags: radialapps/go-vod:${{ github.event.inputs.tagName }} , radialapps/go-vod:latest
-          provenance: false
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fad0484c..917d3500 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,3 +30,39 @@ jobs:
           file_glob: true
           tag: ${{ github.ref }}
           overwrite: true
+
+  docker:
+    runs-on: ubuntu-latest
+
+    name: Build Docker image and push to Docker Hub
+
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Get image label
+        id: image_label
+        run: echo "label=${GITHUB_REF#refs/tags/}" >> $GITHUB_STATE
+
+      - name: Build container image
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          platforms: linux/amd64,linux/arm64
+          context: './'
+          no-cache: true
+          file: 'Dockerfile'
+          tags: radialapps/go-vod:${{ steps.image_label.outputs.label }} , radialapps/go-vod:latest
+          provenance: false
diff --git a/main.go b/main.go
index 02bae723..d6dfab38 100644
--- a/main.go
+++ b/main.go
@@ -8,7 +8,7 @@ import (
 	"github.com/pulsejet/go-vod/go_vod"
 )
 
-const VERSION = "0.1.26"
+const VERSION = "0.1.27"
 
 func main() {
 	// Build initial configuration