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 e7c0135..1b1c9ef 100644 Binary files a/celerybeat-schedule-shm and b/celerybeat-schedule-shm differ diff --git a/celerybeat-schedule-wal b/celerybeat-schedule-wal index 5955bb5..407d1a6 100644 Binary files a/celerybeat-schedule-wal and b/celerybeat-schedule-wal differ 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