From 73c1e142b6ff06f46aa9af60e228b93ddce5adaa Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Sat, 2 May 2020 13:55:29 +0100
Subject: [PATCH] Merge CI and docker workflows

---
 .github/workflows/ci.yml     | 13 +++++++++++--
 .github/workflows/docker.yml | 16 ----------------
 README.md                    |  1 -
 3 files changed, 11 insertions(+), 19 deletions(-)
 delete mode 100644 .github/workflows/docker.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2a4227a..0a2c0c9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,10 +3,19 @@ name: CI
 on: [push, pull_request]
 
 jobs:
-  build:
-
+  docker:
     runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
 
+      - name: Build image
+        run: docker build . --tag ${GITHUB_REPOSITORY,,}
+
+      - name: Show image info
+        run: docker images
+
+  build:
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
 
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
deleted file mode 100644
index a2471a4..0000000
--- a/.github/workflows/docker.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Docker
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-
-      - uses: actions/checkout@v1
-
-      - name: Build image
-        run: docker build .
-
-      - name: Show image info
-        run: docker images
diff --git a/README.md b/README.md
index 36588bb..9d23215 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,5 @@
 
 ![CI](https://github.com/RealOrangeOne/website/workflows/CI/badge.svg)
 ![Deploy](https://github.com/RealOrangeOne/website/workflows/Deploy/badge.svg)
-![Docker](https://github.com/RealOrangeOne/website/workflows/Docker/badge.svg)
 
 Another website, really?