Move Dockerfiles into docker/ directory

Author: JacobCoffee

Makefile

@@ -7,7 +7,7 @@ help:
 
 default: help
 
-.state/docker-build-web: Dockerfile dev-requirements.txt base-requirements.txt
+.state/docker-build-web: docker/Dockerfile dev-requirements.txt base-requirements.txt
 	# Build web container for this project
 	docker compose build --force-rm web
 

docker-compose.yml

@@ -23,12 +23,15 @@ services:
   static:
     command: bin/static
     build:
-      dockerfile: Dockerfile.static
+      context: .
+      dockerfile: docker/Dockerfile.static
     volumes:
       - .:/code
 
   web:
-    build: .
+    build:
+      context: .
+      dockerfile: docker/Dockerfile
     image: pythondotorg:docker-compose
     command: python manage.py runserver 0.0.0.0:8000
     volumes: