From 0b22f5089eff841d1e72e5a601269fc41a94f912 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Tue, 17 Feb 2026 20:12:09 -0600 Subject: [PATCH] Move Dockerfiles into docker/ directory --- Makefile | 2 +- docker-compose.yml | 7 +++++-- Dockerfile => docker/Dockerfile | 0 Dockerfile.cabotage => docker/Dockerfile.cabotage | 0 Dockerfile.static => docker/Dockerfile.static | 0 5 files changed, 6 insertions(+), 3 deletions(-) rename Dockerfile => docker/Dockerfile (100%) rename Dockerfile.cabotage => docker/Dockerfile.cabotage (100%) rename Dockerfile.static => docker/Dockerfile.static (100%) diff --git a/Makefile b/Makefile index ae0c143dc..92aa0cc03 100644 --- a/Makefile +++ b/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 diff --git a/docker-compose.yml b/docker-compose.yml index 0d5bd0bfd..6c1f51245 100644 --- a/docker-compose.yml +++ b/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: diff --git a/Dockerfile b/docker/Dockerfile similarity index 100% rename from Dockerfile rename to docker/Dockerfile diff --git a/Dockerfile.cabotage b/docker/Dockerfile.cabotage similarity index 100% rename from Dockerfile.cabotage rename to docker/Dockerfile.cabotage diff --git a/Dockerfile.static b/docker/Dockerfile.static similarity index 100% rename from Dockerfile.static rename to docker/Dockerfile.static