From a190a214f1acc0def07abb565a0cf7e42a5681b3 Mon Sep 17 00:00:00 2001
From: Mike <michael.johanson@intel.com>
Date: Tue, 16 Mar 2021 15:29:52 -0700
Subject: [PATCH] ci: breakout docker build for merge only

---
 .github/workflows/ci.yml        | 18 ------------------
 .github/workflows/docker-ci.yml | 29 +++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 18 deletions(-)
 create mode 100644 .github/workflows/docker-ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 23605db..6855388 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,24 +41,6 @@ jobs:
       run: cd build && cmake --build . --config Release
     - name: Build RPC (Debug)
       run: cd build && cmake --build . --config Debug
-
-  build-docker:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: docker build
-        run: docker build -f "Dockerfile" --tag vprodemo.azurecr.io/rpc:${{ github.sha }} --tag vprodemo.azurecr.io/rpc:latest .
-      - name: Docker Login
-        uses: docker/login-action@v1.6.0
-        with:
-          registry: vprodemo.azurecr.io
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          logout: true
-      - name: Push the Docker image to the registry
-        run: docker push vprodemo.azurecr.io/rpc:${{ github.sha }}
-      - name: Push the Docker image to the registry
-        run: docker push vprodemo.azurecr.io/rpc:latest
         
   build-linux:
     runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
new file mode 100644
index 0000000..c5bc900
--- /dev/null
+++ b/.github/workflows/docker-ci.yml
@@ -0,0 +1,29 @@
+#*********************************************************************
+# Copyright (c) Intel Corporation 2020
+# SPDX-License-Identifier: Apache-2.0
+#*********************************************************************/
+
+name: Docker Image CI
+
+on:
+  push:
+      branches: [ master ]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build the Docker image
+        run: docker build -f "Dockerfile" --tag vprodemo.azurecr.io/rpc:${{ github.sha }} --tag vprodemo.azurecr.io/rpc:latest .
+      - name: Docker Login
+        uses: docker/login-action@v1.6.0
+        with:
+          registry: vprodemo.azurecr.io
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          logout: true
+      - name: Push the Docker image to the registry
+        run: docker push vprodemo.azurecr.io/rpc:${{ github.sha }}
+      - name: Push the Docker image to the registry
+        run: docker push vprodemo.azurecr.io/rpc:latest
\ No newline at end of file