- fix docker permissions. The custom user was causing issues

- fix nginx mimetypes for local dev

Author: alexlambson

docker-compose.debugger.yml

@@ -5,7 +5,7 @@ services:
     container_name: mapdb-postgres-debugger
     image: postgres:18
     volumes:
-      - ${POSTGRES_DATA_DIR}/debugger-db/:/var/lib/postgresql/18/docker
+      - ${POSTGRES_DATA_DIR}/debugger-db/:/var/lib/postgresql
     environment:
       - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_USER=${POSTGRES_USER}

docker-compose.prod.yml

@@ -3,7 +3,7 @@ services:
     container_name: mapdb-postgres
     image: postgres:18
     volumes:
-      - ${POSTGRES_DATA_DIR}:/var/lib/postgresql/18/docker
+      - ${POSTGRES_DATA_DIR}:/var/lib/postgresql
     environment:
       - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_USER=${POSTGRES_USER}

docker-compose.yml

@@ -3,7 +3,7 @@ services:
     container_name: mapdb-postgres-dev
     image: postgres:18
     volumes:
-      - ${POSTGRES_DATA_DIR}:/var/lib/postgresql/18/docker
+      - ${POSTGRES_DATA_DIR}:/var/lib/postgresql
     environment:
       - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_USER=${POSTGRES_USER}

docker/Dockerfile

@@ -4,38 +4,29 @@ FROM python:3.12-bookworm AS base
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
 
-# Configurable user setup
-ENV USER=cncnet
-ENV UID=1000
-
 WORKDIR /cncnet-map-api
 
 # Install system dependencies
 RUN apt-get update && apt-get install -y liblzo2-dev libmagic1
 
-# Create non-root user with configurable name and UID
-RUN useradd -m -u ${UID} ${USER}
 
 # Copy necessary files for the build
 COPY requirements.txt /cncnet-map-api
 COPY requirements-dev.txt /cncnet-map-api
 COPY web_entry_point.sh /cncnet-map-api
 
 # Set permissions and make script executable
-RUN chmod +x /cncnet-map-api/web_entry_point.sh && \
-    chown -R ${USER}:${USER} /cncnet-map-api
+RUN chmod +x /cncnet-map-api/web_entry_point.sh
 
 RUN pip install --upgrade pip
 
 FROM base AS dev
 RUN pip install -r ./requirements-dev.txt
-USER ${USER}
 ENTRYPOINT ["/cncnet-map-api/web_entry_point.sh"]
 
 FROM base AS prod
 COPY . /cncnet-map-api
 RUN pip install -r ./requirements.txt
-USER ${USER}
 ENTRYPOINT ["/cncnet-map-api/web_entry_point.sh"]
 
 FROM base AS debugger

docker/nginx.conf

@@ -15,11 +15,13 @@ http {
             alias /usr/share/nginx/html/static/;  # The nginx container's mounted volume.
             expires 30d;
             add_header Cache-Control public;
+            include  /etc/nginx/mime.types;
         }
 
         # Serve user uploaded files
         location /silo/ {
             alias /usr/share/nginx/html/silo/;  # The container's mounted volume.
+            include  /etc/nginx/mime.types;
         }
 
         # Proxy requests to the Django app running in gunicorn
@@ -29,6 +31,7 @@ http {
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_redirect off;
         }
     }
 }