docker/docker-compose.yaml.tmpl

@@ -12,12 +12,12 @@ services:
       - ./nginx/conf.d:/etc/nginx/conf.d # Mount Nginx configuration
       - ./static:/var/www/static # Serve static files
     depends_on:
-      - uwsgi
+      - mre_api
 
   mre_api:
     build:
       context: .
-      docker-file: docker/mre.docker-file
+      dockerfile: docker/mre.Dockerfile
     networks:
       - frontend
       - backend
@@ -49,7 +49,7 @@ services:
 
   postgres:
     networks:
-      -backend
+      - backend
     image: postgres:latest
     ports:
       - "5432:5432" # Expose PostgreSQL port (for debugging/admin)

docker/mre.Dockerfile

@@ -3,26 +3,25 @@ FROM python:3.13.2-bullseye
 LABEL MAINTAINER="Chris Diesch <chris@quarterhomes.com>"
 
 WORKDIR /var/www
-# make sure everything it up-to-date
-RUN "apt-get -y update"
 
 # Add the entrypoint and make it executable
-ADD ./entrypoint.sh /var/docker-entrypoint.sh
+ADD ./docker/entrypoint.sh /var/docker-entrypoint.sh
-RUN "chmod +x /var/docker-entrypoint.sh"
+RUN chmod +x /var/docker-entrypoint.sh
 
 # add the requirements and install them
-ADD ../requirements.txt /var/www/requirements.txt
+
-RUN "pip install -Ur /var/www/requirements.txt"
+ADD ./requirements.txt /var/www/requirements.txt
+RUN pip install -Ur /var/www/requirements.txt
 
 # add the uwsgi runner
-ADD ../run.py /var/www/run.py
+ADD ./run.py /var/www/run.py
 
 # set environment variables
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 
 # Copy the app directory
-COPY ../app /var/www/app
+COPY ./app /var/www/app
 
 # define the entrypoint
 ENTRYPOINT ["/var/docker-entrypoint.sh"]