From d2e866dd74c7fa5e134d6601f5352064c0e189d0 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Wed, 15 Apr 2020 14:48:18 +0200
Subject: [PATCH] cleanup/refactor workflows

---
 .github/workflows/{main.yml => ci.yml}        |  0
 ...ker-publish.yml => docker-publish-dev.yml} |  8 ++++----
 .github/workflows/docker-publish-latest.yml   | 19 +++++++++++++++++++
 ...publish.yml => docker-publish-release.yml} |  3 +--
 4 files changed, 24 insertions(+), 6 deletions(-)
 rename .github/workflows/{main.yml => ci.yml} (100%)
 rename .github/workflows/{docker-publish.yml => docker-publish-dev.yml} (82%)
 create mode 100644 .github/workflows/docker-publish-latest.yml
 rename .github/workflows/{docker-release-publish.yml => docker-publish-release.yml} (89%)

diff --git a/.github/workflows/main.yml b/.github/workflows/ci.yml
similarity index 100%
rename from .github/workflows/main.yml
rename to .github/workflows/ci.yml
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish-dev.yml
similarity index 82%
rename from .github/workflows/docker-publish.yml
rename to .github/workflows/docker-publish-dev.yml
index 7122b96f..b777f1da 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish-dev.yml
@@ -1,10 +1,10 @@
-name: Publish branch Docker
+name: publish dev image docker
 on:
   push:
     branches:
-      - master
-      - develop
-
+      - '*'
+      - '*/*'
+      - '!master'
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/docker-publish-latest.yml b/.github/workflows/docker-publish-latest.yml
new file mode 100644
index 00000000..d71f2ff6
--- /dev/null
+++ b/.github/workflows/docker-publish-latest.yml
@@ -0,0 +1,19 @@
+name: publish latest image docker
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Build and publish image
+          uses: ilteoood/docker_buildx@master
+          with:
+            publish: true
+            imageName: vabene1111/recipes
+            tag: latest
+            dockerHubUser: ${{ secrets.DOCKER_USERNAME }}
+            dockerHubPassword: ${{ secrets.DOCKER_PASSWORD }}
diff --git a/.github/workflows/docker-release-publish.yml b/.github/workflows/docker-publish-release.yml
similarity index 89%
rename from .github/workflows/docker-release-publish.yml
rename to .github/workflows/docker-publish-release.yml
index 90b672a7..eee5088b 100644
--- a/.github/workflows/docker-release-publish.yml
+++ b/.github/workflows/docker-publish-release.yml
@@ -1,4 +1,4 @@
-name: Release DockerHub Version
+name: publish tagged release docker
 
 on:
   push:
@@ -20,7 +20,6 @@ jobs:
               with:
                 publish: true
                 imageName: vabene1111/recipes
-                platform: linux/amd64,linux/arm64
                 tag: ${{ steps.get_version.outputs.VERSION }}
                 dockerHubUser: ${{ secrets.DOCKER_USERNAME }}
                 dockerHubPassword: ${{ secrets.DOCKER_PASSWORD }}