From 24f6fe42ccf596933c6e36543e744c9c04271788 Mon Sep 17 00:00:00 2001 From: husanjon Date: Wed, 15 Apr 2026 15:15:05 +0500 Subject: [PATCH] restore composer.json, add mysqli extension --- Dockerfile | 2 +- celerybeat-schedule-shm | Bin 32768 -> 32768 bytes celerybeat-schedule-wal | Bin 78312 -> 201912 bytes docker-compose.yml | 2 +- requirements.txt | 3 ++- scripts/celery.sh | 3 +++ scripts/entrypoint.sh | 11 ++++------- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index d0e9ada..13a0ee4 100755 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /code COPY requirements.txt /code/requirements.txt -RUN uv pip install -r requirements.txt +RUN pip install setuptools && uv pip install -r requirements.txt COPY ./ /code diff --git a/celerybeat-schedule-shm b/celerybeat-schedule-shm index e7c01357f5b7cb60fff3db2d04d1de9e1af9e6bc..1b1c9ef2d869637568e30c0a26589802e2050a5f 100644 GIT binary patch delta 230 zcmZo@U}|V!s+V}A%K!o#K+MR%AYcfjnSoeK_Otgn-T;;b3!a^LQXmtO@X_S8kW|ED zQq=>E0t1k_|B(Pxn2AAgVq@^cITm2VvGK|#$Ibto1ej$-7{nMP7^E0v7~~if7?c=P z7}OXv7_=C481xtnHeNi>H2If@kgOgu;1CdiDVBEWzvG{}_s!-20S*B{nCPBKFCT2`dv%IybD#i|fG88PF^-G9t1Mr* zE!o^)fMm{k7wP;fT&%}7&u~BzO+C2v%53}V4VyOvAc-n{f4y$w=MQC@Pb46T-rBfm zex~3}rOgitkVLI5&z=jnc3ZLeM+1`Ra+Zw-tP9qpZWfq`B-&YOaWejn!s^W$3z0+Dg385CknLiPft-~v|!|%%zMxp z9+}0_0djw}jx5*?H10pYCMUXq6(Rd8*dMJ~fn*@iIQ|uI14S9RCU-R`L5x*^r3M}) z4_ozTkE6Kw&jH-C+}tAc7Eb zj!!WmY{AG2jbBXH=G-l<$?u;ui;Mpf!nHS1Tnlw3#L>KHQB5!?H^18}!>H!skK|f# zf`+=54@;!ucJ13!OG7N~&D%w;YxxL8yvEu|Up}?OErq)lIrE7L;dU+mWX!OA%YQBA z{k>Zr)N(C9FeXrn3NEHOHjT9Ie!?-@?ly7QoHpH#L=I+ayzaN`1o4-5ZU zQ2BJ0AClwug3G4>VMta-4>E$Tvi-Mq#m{{j`S1uvEts%5Qv@l3QJv|tbKi;+hnE=> zbfySe%o22FhLH6-3nSSJNX|qqkwmdXHEw5akDKqP+heo9L?qGufiL{usI30ASz{rRX!F6B ztcC}RoHsjcL=vspYI!QD#Uy5P#6cv{7q5Ju-1KApxw+sXlIUOO&r6cke*f6q@eoNg zxB0f2Aj?+M%?myviJBd8E-IPLd}{j+Mn+^|R)IaSMK}I$zaWS#Z2W|id6v_SmCIi! HG710yj3?k@ diff --git a/docker-compose.yml b/docker-compose.yml index a92e802..3fd33f3 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,7 +32,7 @@ services: celery: build: . - command: celery -A config worker --loglevel=info + command: sh ./scripts/celery.sh restart: always volumes: - .:/code diff --git a/requirements.txt b/requirements.txt index 37a3432..e158375 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +setuptools==70.0.0 cookiecutter==2.5.0 crispy-tailwind==1.0.1 Django==5.0.8 @@ -18,7 +19,7 @@ django-rosetta==0.10.0 django-select2==8.1.2 django-unicorn==0.58.1 djangorestframework-simplejwt==5.3.1 -drf-yasg==1.21.7 +drf-yasg==1.21.10 faker==23.1.0 flower==2.0.1 ipython==8.21.0 diff --git a/scripts/celery.sh b/scripts/celery.sh index 1bfda65..2d2782c 100644 --- a/scripts/celery.sh +++ b/scripts/celery.sh @@ -1,5 +1,8 @@ #!/bin/bash +echo "Installing setuptools for Celery..." +/opt/venv/bin/python -m pip install setuptools + celery -A config worker --loglevel=info & sleep 10 && celery -A config beat --loglevel=info & diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh index 062c402..45fe65d 100644 --- a/scripts/entrypoint.sh +++ b/scripts/entrypoint.sh @@ -1,13 +1,10 @@ #!/usr/bin/bash -python3 manage.py collectstatic --no-input & -python3 manage.py migrate --no-input & -python3 manage.py runserver 0.0.0.0:8000 & +echo "Installing setuptools..." +/opt/venv/bin/python -m pip install setuptools > /dev/null 2>&1 -celery -A config worker --loglevel=info & - -sleep 10 && celery -A config beat --loglevel=info & -sleep 10 && celery -A config flower --loglevel=info & +python3 manage.py collectstatic --no-input +python3 manage.py migrate --no-input gunicorn config.wsgi:application --bind 0.0.0.0:8000