Update compose Dockerfiles (#645)

* Update compose Dockerfiles

* Dockerfile refactoring (#646)

* Dockerfile refactoring

- Moves the dockerfile to root; enables accessing requirements etc from the dockerfile
- got rid of the Dockerfile-dev file because it wasn't being used anywhere. Would be better to add a docker-compose-dev file if we want.
- changed the base to official python image
- updated some dependencies

* switch to python 3.10

* run under a non-root user

* fix failing tests by downgrading psycopg2-binary

---------

Co-authored-by: Tarashish Mishra <[email protected]>

Dockerfile

@@ -0,0 +1,30 @@
+FROM python:3.10-slim-bookworm
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update -qq -y \
+    && apt-get install -y curl wget python3 python3-dev python3-pip git \
+    libgeos-dev libcurl4-gnutls-dev librtmp-dev python3-gdal libyaml-dev \
+    locales nginx supervisor postgresql-client libpq-dev \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+# Requirements have to be pulled and installed here, otherwise caching won't work
+COPY ./requirements /requirements
+
+RUN pip install -r /requirements/production.txt
+
+COPY . /app
+RUN useradd django
+RUN chown -R django:django /app
+
+COPY ./compose/django/gunicorn.sh /gunicorn.sh
+COPY ./compose/django/entrypoint.sh /entrypoint.sh
+RUN sed -i 's/\r//' /entrypoint.sh \
+    && sed -i 's/\r//' /gunicorn.sh \
+    && chmod +x /entrypoint.sh \
+    && chmod +x /gunicorn.sh
+
+WORKDIR /app
+USER django
+
+ENTRYPOINT ["/entrypoint.sh"]

docker-compose.yml

@@ -15,8 +15,6 @@ services:
   django:
     build:
       context: .
-      dockerfile: ./compose/django/Dockerfile
-    user: django
     depends_on:
       - postgres
       - redis
@@ -38,8 +36,6 @@ services:
   celeryworker:
     build:
       context: .
-      dockerfile: ./compose/django/Dockerfile
-    user: django
     env_file: .env
     depends_on:
      - postgres
@@ -49,8 +45,6 @@ services:
   celerybeat:
     build:
       context: .
-      dockerfile: ./compose/django/Dockerfile
-    user: django
     env_file: .env
     depends_on:
       - postgres

requirements/base.txt

@@ -24,7 +24,7 @@ django-cors-headers==3.7.0
 drf-yasg==1.20.0
 
 # For the persistence stores
-psycopg2-binary<2.9
+psycopg2-binary>=2.8,<2.9
 
 # Unicode slugification
 unicode-slugify==0.1.3

requirements/production.txt

@@ -2,5 +2,5 @@
 #	production that isn't in development.
 -r base.txt
 
-gevent==20.9.0
-gunicorn==20.1.0
+gevent==23.9.1
+gunicorn==21.2.0