Implement minor build fixes

.env.sample

@@ -4,6 +4,7 @@ COMPOSE_PROJECT_NAME=cantus
 #When DEVELOPMENT is False, Django's DEBUG setting
 #is False and app is served by gunicorn
 DEVELOPMENT=False
+#DJANGO_SECRET_KEY=**PROVIDE SECRET KEY HERE**
 
 #Postgres authentication variables
 POSTGRES_DB=cantus_db

.github/workflows/lint_and_test.yml

@@ -18,6 +18,7 @@ jobs:
       RABBIT_USER: admin
       RABBIT_PASSWORD: supersecurepassword99
       PORT: "8000"
+      DJANGO_SECRET_KEY: verygoodandsecurekey123456123465@@123456
     steps:
       - uses: actions/checkout@v3
       - run: docker compose build

app/Dockerfile

@@ -1,11 +1,11 @@
 # syntax=docker/dockerfile:1
 # Download and install python dependencies in a container
 FROM python:3.12.3 as dependency-install-container
-ARG APP_PORT
+ARG DEVELOPMENT
 COPY ./poetry.lock ./pyproject.toml ./app/install-packages.sh /code/
 WORKDIR /code
 RUN chmod u+x /code/install-packages.sh && \
-    /code/install-packages.sh $APP_PORT
+    /code/install-packages.sh $DEVELOPMENT
 
 FROM python:3.12.3
 COPY app/django-config.sh /code/
@@ -14,11 +14,11 @@ COPY app/production-mei-files/ /code/production-mei-files/
 EXPOSE 8001
 
 RUN chmod u+x /code/django-config.sh
-RUN echo $(tr -dc A-Za-z0-9 </dev/urandom | head -c 64) >> /etc/key.txt
 # Copy environment dependencies, but not poetry, to the django container
 COPY --from=dependency-install-container /code/.venv /code/.venv
 # Add our python environment binaries and package files to the path
 ENV PATH="$PATH:/code/.venv/bin/" \
-    PYTHONPATH="$PYTHONPATH:/code/.venv/lib/python3.12/site-packages/"
+    PYTHONPATH="$PYTHONPATH:/code/.venv/lib/python3.12/site-packages/" \
+    DJANGO_SETTINGS_MODULE="cantusdata.settings"
 
 WORKDIR /code/public

app/install-packages.sh

@@ -7,7 +7,7 @@ poetry config virtualenvs.options.always-copy true
 poetry config virtualenvs.options.no-pip true
 poetry config virtualenvs.options.no-setuptools true
 
-if [ $1 = "8000" ]; then
+if [ $1 = "True" ]; then
     poetry install --no-cache --with debug
 else
     poetry install --no-cache

app/public/cantusdata/celery.py

@@ -1,9 +1,7 @@
-import os
 from celery import Celery
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "cantusdata.settings")
 app = Celery("cantusdata")
-import cantusdata.settings as settings
+from . import settings
 
 app.config_from_object(settings, namespace="CELERY")
 app.autodiscover_tasks()

app/public/cantusdata/settings.py

@@ -18,8 +18,7 @@
 BASE_DIR = Path(__file__).resolve().parent.parent
 
 # See https://docs.djangoproject.com/en/dev/howto/deployment/checklist/
-with open("/etc/key.txt", "r") as f:
-    SECRET_KEY = f.read().strip()
+SECRET_KEY = os.environ.get("DJANGO_SECRET_KEY")
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = is_development
@@ -47,9 +46,11 @@
     "rest_framework",
     "rest_framework.authtoken",
     "cantusdata.CantusdataConfig",
-    "django_extensions",
 )
 
+if DEBUG:
+    INSTALLED_APPS += ("django_extensions",)
+
 MIDDLEWARE = (
     "django.middleware.security.SecurityMiddleware",  # Migration: + django 3.1
     "django.contrib.sessions.middleware.SessionMiddleware",
@@ -172,7 +173,7 @@
 SECURE_HSTS_INCLUDE_SUBDOMAINS = is_production
 SECURE_HSTS_PRELOAD = is_production
 
-CELERY_BROKER_URL = f"amqp://{os.environ['RABBIT_USER']}:{os.environ['RABBIT_PASSWORD']}@cantus-rabbitmq-1:5672/{os.environ['RABBIT_VHOST']}"
+CELERY_BROKER_URL = f"amqp://{os.environ.get('RABBIT_USER')}:{os.environ.get('RABBIT_PASSWORD')}@cantus-rabbitmq-1:5672/{os.environ.get('RABBIT_VHOST')}"
 CELERY_RESULT_BACKEND = "django-db"
 CELERY_RESULT_PERSISTENT = False
 CELERY_RESULT_EXTENDED = True

docker-compose.yaml

@@ -5,7 +5,7 @@ services:
       context: .
       dockerfile: ./app/Dockerfile
       args:
-        APP_PORT: ${PORT}
+        DEVELOPMENT: ${DEVELOPMENT}
     container_name: cantus-app-1
     command: /code/django-config.sh
     volumes:
@@ -19,6 +19,7 @@ services:
     environment:
       - APP_VERSION=${APP_VERSION}
       - DEVELOPMENT=${DEVELOPMENT}
+      - DJANGO_SECRET_KEY=${DJANGO_SECRET_KEY}
       - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}

pyproject.toml

@@ -11,9 +11,9 @@ djangorestframework = "3.15.1"
 gunicorn = "22.0.0"
 lxml = "5.2.1"
 markdown = "3.6"
-psycopg = "3.1.18"
+psycopg = {extras = ["binary"], version = "^3.1.18"}
 requests = "2.31.0"
-solrpy = "1.0.0"
+solrpy = { git = "https://github.com/search5/solrpy", tag = "rel-1-0-0"}
 
 [tool.poetry.group.debug]
 optional = true