From c1d51392b486fb543c918cb9bcd3beaf86671d26 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Fri, 7 Apr 2023 01:22:16 +0100
Subject: [PATCH] build: update configuration files

---
 .hadolint.yaml      | 2 ++
 docker-compose.yaml | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 .hadolint.yaml

diff --git a/.hadolint.yaml b/.hadolint.yaml
new file mode 100644
index 0000000..d87bf88
--- /dev/null
+++ b/.hadolint.yaml
@@ -0,0 +1,2 @@
+ignore:
+  - DL3059
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 222b847..266559a 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -29,8 +29,7 @@ x-app: &default-app
 
 services:
   web:
-    <<: *default-app
-    <<: *default-proxy
+    <<: [*default-proxy, *default-app]
     build:
       context: .
       target: web