restructured start scripts

Author: mmcinnestaylor

Dockerfile

@@ -19,7 +19,7 @@ RUN apt-get update \
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
   && rm -rf /var/lib/apt/lists/*
 
-# Requirements are installation
+# Install requirements and create static file directories
 RUN pip install --upgrade pip
 COPY $REQUIREMENTS /tmp/requirements.txt
 
@@ -33,17 +33,17 @@ RUN pip install --no-cache-dir -r /tmp/requirements.txt \
   && install -d -m 0755 -o app_user -g app_user /app/media/uploads
 
 # Code and User Setup
-WORKDIR /app
-
 USER app_user:app_user
 
-COPY --chown=app_user:app_user src .
 COPY --chown=app_user:app_user scripts/docker/ docker/
-
 RUN chmod +x docker/*.sh
 
+WORKDIR /app
+
+COPY --chown=app_user:app_user src .
+
 # Docker Run Checks and Configurations
 EXPOSE 8000
 
-ENTRYPOINT [ "docker/entrypoint.sh" ]
-CMD [ "docker/start.sh", "server" ]
+ENTRYPOINT [ "../docker/entrypoint.sh" ]
+CMD [ "../docker/start.sh", "server" ]

deploy/dev/docker-compose.yml

@@ -7,7 +7,7 @@ services:
             args:
                 REQUIREMENTS: requirements-dev.txt
         image: contestsuite:dev
-        command: /app/docker/start.sh server debug
+        command: /docker/start.sh server debug
         environment:
             # Django
             DEBUG: 'True'
@@ -23,17 +23,17 @@ services:
             - 8000:8000
         volumes:
             - ../../src:/app
-            - deployment_scripts:/app/docker
         networks:
             - contestsuite
         depends_on:
+            - mariadb
             - redis
             - rabbitmq
-            - mariadb
             - celery_worker
+        restart: unless-stopped
     scrape_bot:
         image: contestsuite:dev
-        command: /app/docker/start.sh bot
+        command: /docker/start.sh bot
         environment:
             # Django
             DEBUG: 'True'
@@ -49,14 +49,14 @@ services:
             SCRAPE_BOT_TOKEN: # Token for the member list scraping bot
         volumes:
             - ../../src:/app
-            - deployment_scripts:/app/docker
         networks:
             - contestsuite
         depends_on:
             - mariadb
+            - django
     celery_worker:
         image: contestsuite:dev
-        command: /app/docker/start.sh worker debug
+        command: /docker/start.sh worker debug
         environment:
             # Django
             DEBUG: 'True'
@@ -71,16 +71,16 @@ services:
             BOT_CHANNEL_WEBHOOK_URL: # Webhook URL of the bot command channel
         volumes:
             - ../../src:/app
-            - deployment_scripts:/app/docker
         networks:
             - contestsuite
         depends_on:
+            - mariadb
             - redis
             - rabbitmq
-            - mariadb
+        restart: unless-stopped
     celery_beat:
         image: contestsuite:dev
-        command: /app/docker/start.sh beat debug
+        command: /docker/start.sh beat debug
         environment:
             # Django
             DEBUG: 'True'
@@ -91,17 +91,17 @@ services:
             SQL_PASSWORD: seminoles1!
         volumes:
             - ../../src:/app
-            - deployment_scripts:/app/docker
         networks:
             - contestsuite
         depends_on:
-            - celery_worker
+            - mariadb
             - redis
             - rabbitmq
-            - mariadb
+            - celery_worker
+        restart: unless-stopped
     celery_flower:
         image: contestsuite:dev
-        command: /app/docker/start.sh flower debug
+        command: /docker/start.sh flower debug
         environment:
             # Django
             DEBUG: 'True'
@@ -114,14 +114,14 @@ services:
             - 5555:5555
         volumes:
             - ../../src:/app
-            - deployment_scripts:/app/docker
         networks:
             - contestsuite
         depends_on:
             - mariadb
             - redis
             - rabbitmq
             - celery_worker
+        restart: unless-stopped
     mariadb:
         image: mariadb:10.6-focal
         environment:
@@ -146,7 +146,6 @@ services:
         networks:
             - contestsuite       
 volumes:
-    deployment_scripts:
     django_db:
     redis:
     rabbitmq: