changes

Author: marcoacierno

backend/Dockerfile

@@ -14,11 +14,16 @@ ENV DJANGO_SETTINGS_MODULE=pycon.settings.prod \
     CELERY_RESULT_BACKEND=demo \
     HASHID_DEFAULT_SECRET_SALT=demo
 
+# RUN apt-get update -y && apt-get install -y \
+#     libpq-dev libtiff5-dev libjpeg62 libopenjp2-7-dev zlib1g-dev \
+#     libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python3-tk \
+#     libharfbuzz-dev libfribidi-dev libxcb1-dev libldap2-dev libldap-2.5-0 \
+#     ffmpeg libsm6 libxext6 libglib2.0-0 libpango-1.0-0 libpangoft2-1.0-0 libharfbuzz-subset0
 RUN apt-get update -y && apt-get install -y \
-    libpq-dev libtiff5-dev libjpeg62 libopenjp2-7-dev zlib1g-dev \
-    libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python3-tk \
-    libharfbuzz-dev libfribidi-dev libxcb1-dev libldap2-dev libldap-2.5-0 \
-    ffmpeg libsm6 libxext6 libglib2.0-0 libpango-1.0-0 libpangoft2-1.0-0 libharfbuzz-subset0
+    # weasyprint
+    libpango-1.0-0 libpangoft2-1.0-0 libharfbuzz-subset0 \
+    # postgres - psycopg & also psql cli
+    postgresql-client libpq-dev
 
 FROM base AS build-stage
 
@@ -58,12 +63,11 @@ COPY --from=build-stage ${FUNCTION_DIR}/schema.graphql schema.graphql
 
 COPY custom_admin/ .
 
-RUN ADMIN_GRAPHQL_URL=schema.graphql pnpm codegen
-RUN pnpm build
+RUN ADMIN_GRAPHQL_URL=schema.graphql pnpm codegen && pnpm build
 
 # Runtime stage
 
-FROM base
+FROM base AS runtime-stage
 
 ARG FUNCTION_DIR
 
@@ -83,9 +87,7 @@ COPY --chown=app:app . ${FUNCTION_DIR}
 
 USER app
 
-RUN mkdir -p assets
-
-RUN .venv/bin/python manage.py collectstatic --noinput
+RUN mkdir -p assets && .venv/bin/python manage.py collectstatic --noinput
 
 ENTRYPOINT ["/home/app/.venv/bin/gunicorn"]
 CMD [ "pycon.wsgi" ]

backend/pyproject.toml

@@ -73,13 +73,11 @@ dependencies = [
     "django-import-export<4.0.0,>=3.2.0",
     "dal-admin-filters==1.1.0",
     "django-markdownify==0.9.5",
-    "psycopg2==2.9.9",
     "django-imagekit==5.0.0",
     "pillow==10.4.0",
     "redis[hiredis]==5.0.2",
     "google-api-python-client<3.0.0,>=2.94.0",
     "google-auth<3.0.0,>=2.22.0",
-    "opencv-python<5.0.0.0,>=4.8.0.74",
     "argon2-cffi<24.0.0,>=23.1.0",
     "stripe==10.5.0",
     "djangorestframework==3.15.2",
@@ -104,6 +102,8 @@ dependencies = [
     "pypdf>=5.1.0",
     "ipython>=8.30.0",
     "weasyprint>=63.1",
+    "opencv-python-headless>=4.10.0.84",
+    "psycopg[c]>=3.2.3",
 ]
 name = "backend"
 version = "0.1.0"