From 03fa70bd2a21e9d70a6860686fed7bf0c6147864 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <iBotPeaches@users.noreply.github.com>
Date: Mon, 16 Oct 2023 06:58:05 -0400
Subject: [PATCH] build: docker fixes (#3378)

* build: shorten tags on docker push

* build: only deploy on commits to master
---
 .github/workflows/docker-beta.yml    | 9 ++++-----
 .github/workflows/docker-release.yml | 2 --
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker-beta.yml b/.github/workflows/docker-beta.yml
index 272b94b11f..665fb06715 100644
--- a/.github/workflows/docker-beta.yml
+++ b/.github/workflows/docker-beta.yml
@@ -1,9 +1,9 @@
 name: Build and push docker (beta)
 
 on:
-  pull_request:
-    branches: [master]
-    types: [closed]
+  push:
+    branches:
+      - master
 
 env:
   REGISTRY: ghcr.io
@@ -43,5 +43,4 @@ jobs:
           push: true
           tags: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.APKTOOL_HASH }}
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:beta
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:master
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:snapshot
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 3a0dc2feb1..179de78099 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -44,7 +44,5 @@ jobs:
           file: ./docker/Dockerfile
           push: true
           tags: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.APKTOOL_HASH }}
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.APKTOOL_TAG }}
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:prod
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest