From 1ea83520e60fb9b4f4bc7f9aa760c68b7807b009 Mon Sep 17 00:00:00 2001
From: Katie Thornhill <katie.thornhill@citrix.com>
Date: Wed, 20 Nov 2019 01:10:44 -0500
Subject: [PATCH 1/4] chore: add cicd

---
 .github/workflows/docker.yml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .github/workflows/docker.yml

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 0000000..dfe0ebf
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,35 @@
+on: 
+  push:
+    branches:
+      - master
+      - cicd
+
+name: Docker Workflow
+
+jobs:
+  build_publish:
+    name: Build and Publish
+    runs-on: ubuntu-latest
+    container:
+      image: jonoh/docker-buildx-qemu
+      volumes:
+        - /var/run/docker.sock:/var/run/docker.sock
+      env:
+        DOCKER_CLI_EXPERIMENTAL: enabled
+        BUILDX: /root/.docker/cli-plugins/docker-buildx
+      options: --privileged
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Docker Login
+        run: |
+          echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+      - name: Buildx Setup
+        run: |
+          update-binfmts --enable
+          $BUILDX create --name build --use
+          $BUILDX inspect --bootstrap
+      - name: Buildx Build
+        run: |
+          $BUILDX build --platform linux/arm64,linux/arm/v7,linux/amd64 --pull -t katie/roleypoly:${{ github.sha }} --push .
+    
\ No newline at end of file

From 55f0bf83078e4c00ee0353f7dbdf592b2d18c03c Mon Sep 17 00:00:00 2001
From: Katie Thornhill <katie.thornhill@citrix.com>
Date: Wed, 20 Nov 2019 01:10:44 -0500
Subject: [PATCH 2/4] chore: add cicd

---
 .github/workflows/docker.yml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .github/workflows/docker.yml

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 0000000..2245f03
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,35 @@
+on: 
+  push:
+    branches:
+      - master
+      - cicd
+
+name: Docker Workflow 
+
+jobs:
+  build_publish:
+    name: Build and Publish
+    runs-on: ubuntu-latest
+    container:
+      image: jonoh/docker-buildx-qemu
+      volumes:
+        - /var/run/docker.sock:/var/run/docker.sock
+      env:
+        DOCKER_CLI_EXPERIMENTAL: enabled
+        BUILDX: /root/.docker/cli-plugins/docker-buildx
+      options: --privileged
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Docker Login
+        run: |
+          echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+      - name: Buildx Setup
+        run: |
+          update-binfmts --enable
+          $BUILDX create --name build --use
+          $BUILDX inspect --bootstrap
+      - name: Buildx Build
+        run: |
+          $BUILDX build --platform linux/arm64,linux/arm/v7,linux/amd64 --pull -t katie/roleypoly:${{ github.sha }} --push .
+    
\ No newline at end of file

From 4f0d1ee3163636b7817fc19d9cf226f61a8fc7d4 Mon Sep 17 00:00:00 2001
From: Katie Thornhill <katie.thornhill@citrix.com>
Date: Wed, 20 Nov 2019 01:39:01 -0500
Subject: [PATCH 3/4] chore: remove cross-compilation, very not necessary.

---
 .github/workflows/docker.yml | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index dfe0ebf..d67cb58 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -8,28 +8,20 @@ name: Docker Workflow
 
 jobs:
   build_publish:
-    name: Build and Publish
+    name: Build and Push
     runs-on: ubuntu-latest
-    container:
-      image: jonoh/docker-buildx-qemu
-      volumes:
-        - /var/run/docker.sock:/var/run/docker.sock
-      env:
-        DOCKER_CLI_EXPERIMENTAL: enabled
-        BUILDX: /root/.docker/cli-plugins/docker-buildx
-      options: --privileged
     steps:
       - uses: actions/checkout@v1
 
       - name: Docker Login
         run: |
           echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-      - name: Buildx Setup
+  
+      - name: Docker Build
         run: |
-          update-binfmts --enable
-          $BUILDX create --name build --use
-          $BUILDX inspect --bootstrap
-      - name: Buildx Build
-        run: |
-          $BUILDX build --platform linux/arm64,linux/arm/v7,linux/amd64 --pull -t katie/roleypoly:${{ github.sha }} --push .
+          docker build . -t katie/roleypoly:${{ github.sha }}
+      
+      - name: Docker Push
+        run: | 
+          docker push katie/roleypoly:${{ github.sha }}
     
\ No newline at end of file

From 1cfbb00a64e0062ae222e7c0b78977623399b100 Mon Sep 17 00:00:00 2001
From: Katie Thornhill <katie.thornhill@citrix.com>
Date: Wed, 20 Nov 2019 01:48:25 -0500
Subject: [PATCH 4/4] chore: remove cicd branch

---
 .github/workflows/docker.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d67cb58..55a0b4a 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -2,7 +2,6 @@ on:
   push:
     branches:
       - master
-      - cicd
 
 name: Docker Workflow