From e64d0044b196f4d94a52b8d3e2776e22f853d701 Mon Sep 17 00:00:00 2001
From: kevin zhuang <kevin7441@gmail.com>
Date: Mon, 11 May 2020 16:05:58 +1000
Subject: [PATCH] remove docker build, combine to one

---
 .github/workflows/awscodebuild.yml |  8 +++++++-
 .github/workflows/dockerimage.yml  | 24 ------------------------
 README.md                          |  1 -
 3 files changed, 7 insertions(+), 26 deletions(-)
 delete mode 100644 .github/workflows/dockerimage.yml

diff --git a/.github/workflows/awscodebuild.yml b/.github/workflows/awscodebuild.yml
index 5710101..98d9ce3 100644
--- a/.github/workflows/awscodebuild.yml
+++ b/.github/workflows/awscodebuild.yml
@@ -1,4 +1,4 @@
-name: AWSCodeBuild
+name: DockerBuild
 
 on:
   push:
@@ -26,3 +26,9 @@ jobs:
         uses: aws-actions/aws-codebuild-run-project@v1.0.0
         with:
           project-name: dotbare
+      - uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: kazhala/dotbare
+          tags: latest
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
deleted file mode 100644
index 117947f..0000000
--- a/.github/workflows/dockerimage.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: DockerBuild
-
-on:
-  push:
-    branches:
-      - master
-
-defaults:
-  run:
-    shell: bash
-    working-directory: .
-
-jobs:
-  build:
-    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: kazhala/dotbare
-          tag_with_sha: true
diff --git a/README.md b/README.md
index 179fa68..d2d2da3 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 # dotbare
 
 ![](https://github.com/kazhala/dotbare/workflows/DockerBuild/badge.svg)
-![](https://github.com/kazhala/dotbare/workflows/AWSCodeBuild/badge.svg)
 ![](https://travis-ci.com/kazhala/dotbare.svg?branch=master)
 ![](https://codebuild.ap-southeast-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiQVZraHNtSFpDSjFETVBOcndEY1k0UVNEcWpYUmx1TFArMXRxQ0VLWitGQkhKOEZOOCtQSEZvdXFlQ2htcUlTMzdIeVNEWW81cFhndVJTeE1QWUFEQTQwPSIsIml2UGFyYW1ldGVyU3BlYyI6Ik1XQUc2VDYvY0JOTmUwYTMiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master)