From e80ebf180c054c94628ef3c8758a5877de74b024 Mon Sep 17 00:00:00 2001
From: Shirshanka Das <shirshanka@apache.org>
Date: Sat, 6 Feb 2021 15:22:52 -0800
Subject: [PATCH] simplify docker action

---
 .../.github/workflows/docker-frontend.yml     | 56 -------------------
 .../.github/workflows/docker-ingest.yml       | 35 ++++++++++++
 2 files changed, 35 insertions(+), 56 deletions(-)
 delete mode 100644 metadata-ingestion/.github/workflows/docker-frontend.yml
 create mode 100644 metadata-ingestion/.github/workflows/docker-ingest.yml

diff --git a/metadata-ingestion/.github/workflows/docker-frontend.yml b/metadata-ingestion/.github/workflows/docker-frontend.yml
deleted file mode 100644
index 500cc5071b..0000000000
--- a/metadata-ingestion/.github/workflows/docker-frontend.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-name: datahub-ingest docker
-on:
-  push:
-    branches:
-      - main
-    paths-ignore:
-      - 'docs/**'
-      - '**.md'
-  pull_request:
-    branches:
-      - main
-    paths:
-      - 'docker/**'
-      - '.github/workflows/docker-frontend.yml'
-    paths_ignore:
-      - '**.md'
-      - '**.env'
-  release:
-    types: [published, edited]
-
-jobs:
-  setup:
-    runs-on: ubuntu-latest
-    outputs:
-      tag: ${{ steps.tag.outputs.tag }}
-      publish: ${{ steps.publish.outputs.publish }}
-    steps:
-      - uses: actions/checkout@v2
-      - id: tag
-        run: |
-          echo "GITHUB_REF: $GITHUB_REF"
-          TAG=$(echo ${GITHUB_REF} | sed -e 's,refs/heads/master,latest,g' -e 's,refs/tags/,,g' -e 's,refs/pull/\([0-9]*\).*,pr\1,g')
-          echo "tag=$TAG"
-          echo "::set-output name=tag::$TAG"
-      - name: Check whether publishing enabled
-        id: publish
-        env:
-            ENABLE_PUBLISH: ${{ secrets.DOCKER_PASSWORD }}
-        run: |
-            echo "Enable publish: ${{ env.ENABLE_PUBLISH != '' }}"
-            echo "::set-output name=publish::${{ env.ENABLE_PUBLISH != '' }}"
-  build-and-publish-dockerhub:
-    runs-on: ubuntu-latest
-    needs: setup
-    steps:
-      - uses: actions/checkout@v2
-      - uses: docker/build-push-action@v1
-        env:
-          DOCKER_BUILDKIT: 1
-        with:
-          dockerfile: ./docker/Dockerfile
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: acryldata/designpartners
-          tags: ${{ needs.setup.outputs.tag }}
-          push: ${{ needs.setup.outputs.publish == 'true' }}
diff --git a/metadata-ingestion/.github/workflows/docker-ingest.yml b/metadata-ingestion/.github/workflows/docker-ingest.yml
new file mode 100644
index 0000000000..6065e1b1bf
--- /dev/null
+++ b/metadata-ingestion/.github/workflows/docker-ingest.yml
@@ -0,0 +1,35 @@
+name: datahub-ingest docker
+on:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - 'docs/**'
+      - '**.md'
+  pull_request:
+    branches:
+      - main
+    paths:
+      - 'docker/**'
+      - '.github/workflows/docker-ingest.yml'
+    paths_ignore:
+      - '**.md'
+      - '**.env'
+  release:
+    types: [published, edited]
+
+jobs:
+  push_to_registries:
+    name: Push Docker image to repo
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+      - uses: actions/checkout@v2
+      - name: Push to Docker Hub
+      - uses: docker/build-push-action@v1
+      - with:
+            dockerfile: ./docker/Dockerfile
+            username: ${{ secrets.DOCKER_USERNAME }}
+            password: ${{ secrets.DOCKER_PASSWORD }}
+            repository: acryldata/designpartners
+            tag_with_ref: true