From 66ed5f3db980575760746daab270188d0d803668 Mon Sep 17 00:00:00 2001
From: Riordan Panayides <riordan@panayid.es>
Date: Sat, 8 Oct 2022 13:06:59 +0100
Subject: [PATCH] Enable deployments from 'production' branch push, add tag
 field for rollbacks to git sha

---
 .github/workflows/docker-publish.yml |  2 +-
 .github/workflows/fly-deploy.yml     | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index b76c87b..1e18a12 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -2,7 +2,7 @@ name: Publish Docker Image to GCR
 
 on:
   push:
-    branches: [main, master]
+    branches: [main, master, production]
   workflow_call:
     secrets:
       GCR_PROJECT:
diff --git a/.github/workflows/fly-deploy.yml b/.github/workflows/fly-deploy.yml
index 7c13aaf..2d796d7 100644
--- a/.github/workflows/fly-deploy.yml
+++ b/.github/workflows/fly-deploy.yml
@@ -2,6 +2,20 @@ name: Deploy to Fly
 
 on: workflow_dispatch
 
+on:
+  workflow_run:
+      workflows: ["Publish Docker Image to GCR"]
+      branches: [production]
+      types: 
+        - completed
+  workflow_dispatch:
+    inputs:
+        imageTag:
+          description: 'Docker Image Tag'
+          required: true
+          type: string
+          default: 'latest'
+
 env:
   FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}