From 3dd327fafcdc5c11a3dde4075623081c6c757e03 Mon Sep 17 00:00:00 2001
From: Will Norris <will@willnorris.com>
Date: Tue, 12 Oct 2021 20:48:18 -0700
Subject: [PATCH] actions: combine docker workflows

---
 .github/workflows/docker-latest.yml            | 18 ------------------
 .../workflows/{docker-tags.yml => docker.yml}  |  2 ++
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 .github/workflows/docker-latest.yml
 rename .github/workflows/{docker-tags.yml => docker.yml} (95%)

diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml
deleted file mode 100644
index fb48f72..0000000
--- a/.github/workflows/docker-latest.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-on:
-  push:
-    branches:
-    - 'main'
-name: docker-publish-latest
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - uses: docker/build-push-action@v1
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        repository: willnorris/imageproxy
-        tags: latest
diff --git a/.github/workflows/docker-tags.yml b/.github/workflows/docker.yml
similarity index 95%
rename from .github/workflows/docker-tags.yml
rename to .github/workflows/docker.yml
index 1b46d63..d6641cc 100644
--- a/.github/workflows/docker-tags.yml
+++ b/.github/workflows/docker.yml
@@ -1,5 +1,7 @@
 on:
   push:
+    branches:
+    - 'main'
     tags:
     - '*'
 name: docker-publish-tags