Moved log location and broke huey out to a separate container

.gitignore

@@ -14,7 +14,8 @@ setup.cfg
 /cover/
 .coverage
 debug.log
-/docker/configs/ssl-certs/
-/docker/configs/shib-certs/
-/docker/redis_data/
+/docker/volumes/ssl-certs/
+/docker/volumes/shib-certs/
+/docker/volumes/redis_data/
+/docker/volumes/logs/
 *.env

Dockerfile

@@ -12,8 +12,6 @@ COPY requirements.txt requirements.txt
 RUN pip install -r requirements.txt
 
 COPY . .
-COPY appEntrypoint.sh /appEntrypoint.sh
-RUN chmod +x /appEntrypoint.sh
 
 EXPOSE 8000
-CMD ["/appEntrypoint.sh"]
+CMD ["gunicorn", "--workers=5", "--bind=0.0.0.0:8000", "puzzlehunt_server.wsgi:application"]

docker-compose.yml

@@ -9,13 +9,13 @@ services:
       POSTGRES_USER: ${DB_USER}
       POSTGRES_PASSWORD: ${DB_PASSWORD}
     volumes:
-      - ./docker/db_data:/var/lib/postgresql/data
+      - ./docker/volumes/db_data:/var/lib/postgresql/data
 
   redis:
     image: redis:5-alpine
     restart: always
     volumes:
-      - ./docker/redis_data:/data
+      - ./docker/volumes/redis_data:/data
 
   app:
     build:
@@ -24,11 +24,13 @@ services:
         http_proxy:
         https_proxy:
         no_proxy:
+    image: django_puzzlehunt  # Name image for use in huey
     restart: always
     volumes:
       - .:/code  # Enables live modification of django files
       - static:/static
       - media:/media
+      - ./docker/volumes/logs:/var/log/external
     environment:
       - DOMAIN
       - DJANGO_SECRET_KEY
@@ -43,6 +45,20 @@ services:
       - db
       - redis
 
+  huey:
+    image: django_puzzlehunt # re-use above image
+    command: bash -c "python /code/manage.py migrate --no-input && python /code/manage.py run_huey --quiet"
+    restart: always
+    volumes:
+      - .:/code
+      - ./docker/volumes/logs:/var/log/external
+    environment:
+      - DJANGO_SECRET_KEY
+      - DJANGO_SETTINGS_MODULE=puzzlehunt_server.settings.env_settings
+      - DATABASE_URL=postgres://${DB_USER}:${DB_PASSWORD}@db/${DB_NAME}
+    depends_on:
+      - app
+
   web:
     restart: always
     build:

docker/shib_override.yml

@@ -5,8 +5,8 @@ services:
     build:
       dockerfile: apacheShibDockerfile
     volumes:
-      - ./docker/configs/shib-certs/:/etc/shibboleth/certs/
-      - ./docker/configs/ssl-certs/:/etc/letsencrypt/
+      - ./docker/volumes/shib-certs/:/etc/shibboleth/certs/
+      - ./docker/volumes/ssl-certs/:/etc/letsencrypt/
     ports:
       - "443"
   app:

docker/volumes/logs/README

@@ -0,0 +1 @@
+This directory will hold all of the logs from the various services

docker/volumes/shib-certs/README

@@ -0,0 +1 @@
+Put sp-key.pem and sp-cert.pem in this directory when deploying shibboleth

docker/volumes/ssl-certs/README

@@ -0,0 +1 @@
+This directory will hold lets-encrypt data when using shib-override.yml

puzzlehunt_server/settings/base_settings.py

@@ -92,7 +92,7 @@
 LOGIN_URL = 'login_selection'
 
 # Random settings
-SILENCED_SYSTEM_CHECKS = ["urls.W005"] # silences admin url override warning
+SILENCED_SYSTEM_CHECKS = ["urls.W005"]  # silences admin url override warning
 CRISPY_TEMPLATE_PACK = 'bootstrap3'
 DEBUG_TOOLBAR_PATCH_SETTINGS = False
 BOOTSTRAP_ADMIN_SIDEBAR_MENU = True
@@ -124,23 +124,26 @@
     "sn": (False, "sn")
 }
 
-# Logging settings
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,
     'handlers': {
-        'noop': {
-            'level': 'WARNING',
-            'class': 'logging.NullHandler',
+        'file': {
+            'level': 'INFO',
+            'class': 'logging.FileHandler',
+            'filename': '/var/log/external/django.log',
         },
     },
-    'loggers': {},
-    'formatters': {
-        'verbose': {
-            'format': '%(levelname)s %(asctime)s %(module)s %(message)s'
+    'loggers': {
+        'django': {
+            'handlers': ['file'],
+            'level': 'INFO',
+            'propagate': True,
         },
-        'simple': {
-            'format': '%(levelname)s %(message)s'
+        'huntserver': {
+            'handlers': ['file'],
+            'level': 'INFO',
+            'propagate': True,
         },
     },
 }