Merge pull request #4 from iosifnicolae2/main

Improve the project template

Author: iosifnicolae2

.dockerignore

@@ -0,0 +1,2 @@
+venv
+.env*

Dockerfile

@@ -1,3 +1,8 @@
+FROM python:3.11 AS requirements
+WORKDIR /app
+COPY . /app
+RUN ./scripts/generate-requirements.sh > ./unified_requirements.txt
+
 FROM python:3.11
 
 WORKDIR /app
@@ -9,14 +14,17 @@ ENV PYTHONUNBUFFERED 1
 RUN apt-get update
 RUN apt-get install gettext -y
 
-COPY requirements.txt /app/requirements.txt
-RUN pip install --no-cache-dir --upgrade -r requirements.txt
-RUN pip install psycopg2-binary --force-reinstall --no-cache-dir;
+COPY --from=requirements /app/unified_requirements.txt /app/
+RUN cat /app/unified_requirements.txt | pip install -r /dev/stdin;
+RUN pip install psycopg2-binary;
 
 COPY . /app
 
-RUN find . -name "requirements.txt" -print0 | xargs -0 -n1 pip install --upgrade -r;
+RUN python manage.py collectstatic --noinput
+
+RUN useradd -m -u 1001 -s /bin/bash app
+USER 1001
 
-EXPOSE 8000
+EXPOSE 8080
 
 CMD ["/app/scripts/run-server.sh"]

Makefile

@@ -14,7 +14,7 @@ venv/touchfile: requirements.txt
 	touch venv/touchfile
 
 install-requirements: venv/touchfile
-	. venv/bin/activate && find . -name "requirements.txt" -print0 | xargs -0 -n1 pip install --upgrade -r ; \
+	. venv/bin/activate && ./scripts/generate-requirements.sh | pip install --upgrade -r /dev/stdin
 	. venv/bin/activate && pip install psycopg2-binary --force-reinstall --no-cache-dir; \
 	cd superapp/apps/admin_portal/tailwind && npm install
 
@@ -28,7 +28,7 @@ start-docker:
 
 destroy-docker:
 	docker-compose stop
-	docker-compose down
+	docker-compose down -v
 
 migrate:
 	python3 manage.py migrate
@@ -63,4 +63,3 @@ create-fixtures:
 
 load-fixtures:
 	python3 manage.py loaddata fixtures/initial_data.json
-

docker-compose.yml

@@ -2,8 +2,9 @@ services:
   postgres:
     image: timescale/timescaledb-ha:pg16
     restart: unless-stopped
+    shm_size: 2gb
     volumes:
-      - db_data:/var/lib/postgresql/data
+      - db_data:/home/postgres/pgdata/data
     env_file:
       - .env
     ports:

scripts/generate-requirements.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+
+cat requirements.txt
+find . -name "requirements.txt" -print0 | xargs -0 cat

scripts/run-server.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-
 set -e;
 
-python manage.py runserver 0.0.0.0:8000
+python manage.py migrate
+python manage.py runserver 0.0.0.0:8080