Merge branch 'mmcinnestaylor:main' into main

Author: mmcinnestaylor

CONTRIBUTING.md

@@ -82,7 +82,7 @@ Programming-Contest-Suite/
 
 ## Testing & Development Server 
 
-`deploy/dev/docker-compose.yml` contains an example deployment intended for [Docker Compose](https://docs.docker.com/compose/) and suitable for local testing and development. 
+`deploy/docker-compose.yml` contains an example deployment intended for [Docker Compose](https://docs.docker.com/compose/) and suitable for local testing and development. 
 
 If you are running the development deployment for the first time, or have made any changes to the project's Celery tasks, run:  
 

README.md

@@ -48,7 +48,7 @@ There are many ways to [deploy Django](https://docs.djangoproject.com/en/4.2/how
 
 ### Docker
 
-Please reference `docs/docker/` for image creation and usage documentation. Pre-built images are available in the project's [Docker Hub repository](https://hub.docker.com/r/acmfsu/contestsuite). Reference `deploy/dev/docker-compose.yml` for an example deployment intended for [Docker Compose](https://docs.docker.com/compose/) and suitable for local development and testing purposes.
+Please reference `docs/docker/` for image creation and usage documentation. Pre-built images are available in the project's [Docker Hub repository](https://hub.docker.com/r/acmfsu/contestsuite). Reference `deploy/docker-compose.yml` for an example deployment intended for [Docker Compose](https://docs.docker.com/compose/) and suitable for local development and testing purposes.
 
 #### Default Superuser
 user: `contestadmin`  

deploy/dev/docker-compose.yml renamed to deploy/docker-compose.yml

@@ -3,7 +3,7 @@ version: '3.8'
 services:
     django:
         build:
-            context: ../..
+            context: ../
             args:
                 REQUIREMENTS: requirements-dev.txt
         image: contestsuite:dev

docs/index.md

@@ -28,7 +28,7 @@ There are many ways to [deploy Django](https://docs.djangoproject.com/en/4.2/how
 
 ### Docker
 
-Please reference our [Docker image documentation]({{ site.url }}/docker.html) for creation and usage details. Pre-built images are available in the project's [Docker Hub repository](https://hub.docker.com/r/acmfsu/contestsuite). An example deployment intended for [Docker Compose](https://docs.docker.com/compose/) and suitable for local development and testing purposes is available in the repository's [deploy directory](https://github.com/mmcinnestaylor/Programming-Contest-Suite/tree/main/deploy/dev).
+Please reference our [Docker image documentation]({{ site.url }}/docker.html) for creation and usage details. Pre-built images are available in the project's [Docker Hub repository](https://hub.docker.com/r/acmfsu/contestsuite). An example deployment intended for [Docker Compose](https://docs.docker.com/compose/) and suitable for local development and testing purposes is available in the repository's [deploy directory](https://github.com/mmcinnestaylor/Programming-Contest-Suite/tree/main/deploy).
 
 #### Default Superuser
 user: `contestadmin`