From 21e36c47b9b58994b60d49bd22ee51c21d6f9e90 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Tue, 28 Dec 2021 01:28:23 +0000
Subject: [PATCH] build: move Dockerfile

---
 tools/docker/Dockerfile => Dockerfile | 0
 docker-compose.yaml                   | 3 ---
 run                                   | 2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)
 rename tools/docker/Dockerfile => Dockerfile (100%)

diff --git a/tools/docker/Dockerfile b/Dockerfile
similarity index 100%
rename from tools/docker/Dockerfile
rename to Dockerfile
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 64fa6a2..1a42bb1 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -8,7 +8,6 @@ volumes:
 services:
   nginx:
     build:
-      dockerfile: tools/docker/Dockerfile
       context: .
       target: nginx
     volumes:
@@ -25,7 +24,6 @@ services:
   php:
     build:
       context: .
-      dockerfile: tools/docker/Dockerfile
       target: dev
     image: ghcr.io/opdavies/oliverdavies-uk-php:7.4-alpine
     volumes:
@@ -52,7 +50,6 @@ services:
   node:
     build:
       context: .
-      dockerfile: tools/docker/Dockerfile
       target: assets
     image: ghcr.io/opdavies/oliverdavies-uk-assets:node-14
     working_dir: /node
diff --git a/run b/run
index 6f03406..9ab85a1 100755
--- a/run
+++ b/run
@@ -91,7 +91,7 @@ function task:lint:dockerfile {
     hadolint/hadolint hadolint \
     --ignore DL3008 \
     --ignore DL3022 \
-    "${@}" - < tools/docker/Dockerfile
+    "${@}" - < Dockerfile
 }
 
 function task:test:functional {