From 5ce73f765a517f1332081bd0f10d2b06458699b4 Mon Sep 17 00:00:00 2001 From: mahdavi Date: Wed, 26 Jun 2024 15:35:11 +0330 Subject: [PATCH] new start --- Dockerfile | 14 ++-- requirements.in | 6 +- requirements.txt | 181 +++++++++++++++++++++++++---------------------- 3 files changed, 107 insertions(+), 94 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2504df2..5bf6837 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ -FROM debian:11 +FROM debian:12 ENV PYTHONUNBUFFERED 1 WORKDIR /app RUN apt update -RUN apt install gnupg2 -y -RUN echo "deb http://repo.mysql.com/apt/debian/ bullseye mysql-8.0" >> /etc/apt/sources.list -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 467B942D3A79BD29 -RUN apt update -RUN apt install libmysqlclient-dev libssl-dev libcrypto++-dev lsb-release python3-pip -y +#RUN apt install gnupg2 -y +#RUN echo "deb http://repo.mysql.com/apt/debian/ bullseye mysql-8.0" >> /etc/apt/sources.list +#RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 467B942D3A79BD29 +#RUN apt update +#RUN apt install libmysqlclient-dev libssl-dev libcrypto++-dev lsb-release python3-pip -y COPY requirements.txt /app/requirements.txt RUN pip install -r requirements.txt RUN apt install netcat -y RUN apt update COPY . /app -ENTRYPOINT ["./run.sh"] +#ENTRYPOINT ["./run.sh"] diff --git a/requirements.in b/requirements.in index 17941b1..6dcc412 100644 --- a/requirements.in +++ b/requirements.in @@ -6,9 +6,6 @@ markdown django-filter django-cors-headers pillow -django-model-utils -mysqlclient -django-mysql python-decouple gunicorn gevent @@ -17,3 +14,6 @@ celery drf-spectacular django-crispy-forms crispy_bootstrap5 +django-jalali-date +django-betterforms +psycopg[binary] \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 976fce9..9239d4f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,148 +1,161 @@ # -# This file is autogenerated by pip-compile with python 3.9 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: # # pip-compile # -amqp==5.1.1 +amqp==5.2.0 # via kombu -asgiref==3.5.2 - # via django -async-timeout==4.0.2 +asgiref==3.8.1 + # via + # django + # django-cors-headers +async-timeout==4.0.3 # via redis -attrs==22.1.0 - # via jsonschema -billiard==3.6.4.0 +attrs==23.2.0 + # via + # jsonschema + # referencing +billiard==4.2.0 # via celery -celery==5.2.7 +celery==5.4.0 # via -r requirements.in -certifi==2022.6.15 +certifi==2024.6.2 # via requests -cffi==1.15.1 +cffi==1.16.0 # via cryptography -charset-normalizer==2.1.1 +charset-normalizer==3.3.2 # via requests -click==8.1.3 +click==8.1.7 # via # celery # click-didyoumean # click-plugins # click-repl -click-didyoumean==0.3.0 +click-didyoumean==0.3.1 # via celery click-plugins==1.1.1 # via celery -click-repl==0.2.0 +click-repl==0.3.0 # via celery -crispy-bootstrap5==0.6 +crispy-bootstrap5==2024.2 # via -r requirements.in -cryptography==37.0.4 +cryptography==42.0.8 # via jwcrypto -deprecated==1.2.13 - # via - # jwcrypto - # redis -django==4.1 +django==5.0.6 # via # -r requirements.in # crispy-bootstrap5 + # django-betterforms # django-cors-headers + # django-crispy-forms # django-filter - # django-model-utils - # django-mysql + # django-jalali-date # django-oauth-toolkit # djangorestframework # drf-spectacular -django-cors-headers==3.13.0 +django-betterforms==2.0.0 # via -r requirements.in -django-crispy-forms==1.14.0 +django-cors-headers==4.4.0 + # via -r requirements.in +django-crispy-forms==2.2 # via # -r requirements.in # crispy-bootstrap5 -django-filter==22.1 +django-filter==24.2 # via -r requirements.in -django-model-utils==4.2.0 +django-jalali-date==1.1.3 # via -r requirements.in -django-mysql==4.7.1 +django-oauth-toolkit==2.4.0 # via -r requirements.in -django-oauth-toolkit==2.1.0 - # via -r requirements.in -djangorestframework==3.13.1 +djangorestframework==3.15.2 # via # -r requirements.in # drf-spectacular -drf-spectacular==0.23.1 +drf-spectacular==0.27.2 # via -r requirements.in -gevent==21.12.0 +gevent==24.2.1 # via -r requirements.in -greenlet==1.1.2 +greenlet==3.0.3 # via gevent -gunicorn==20.1.0 +gunicorn==22.0.0 # via -r requirements.in -idna==3.3 +idna==3.7 # via requests -importlib-metadata==4.12.0 - # via markdown inflection==0.5.1 # via drf-spectacular -jsonschema==4.14.0 +jalali-core==1.0.0 + # via jdatetime +jdatetime==5.0.0 + # via django-jalali-date +jsonschema==4.22.0 # via drf-spectacular -jwcrypto==1.3.1 - # via django-oauth-toolkit -kombu==5.2.4 - # via celery -markdown==3.4.1 - # via -r requirements.in -mysqlclient==2.1.1 - # via -r requirements.in -oauthlib==3.2.0 - # via django-oauth-toolkit -packaging==21.3 - # via redis -pillow==9.2.0 - # via -r requirements.in -prompt-toolkit==3.0.30 - # via click-repl -pycparser==2.21 - # via cffi -pyparsing==3.0.9 - # via packaging -pyrsistent==0.18.1 +jsonschema-specifications==2023.12.1 # via jsonschema -python-decouple==3.6 - # via -r requirements.in -pytz==2022.2.1 - # via - # celery - # djangorestframework -pyyaml==6.0 - # via drf-spectacular -redis==4.3.4 - # via -r requirements.in -requests==2.28.1 +jwcrypto==1.5.6 # via django-oauth-toolkit -six==1.16.0 +kombu==5.3.7 + # via celery +markdown==3.6 + # via -r requirements.in +oauthlib==3.2.2 + # via django-oauth-toolkit +packaging==24.1 + # via gunicorn +pillow==10.3.0 + # via -r requirements.in +prompt-toolkit==3.0.47 # via click-repl -sqlparse==0.4.2 +psycopg[binary]==3.1.19 + # via -r requirements.in +psycopg-binary==3.1.19 + # via psycopg +pycparser==2.22 + # via cffi +python-dateutil==2.9.0.post0 + # via celery +python-decouple==3.8 + # via -r requirements.in +pytz==2024.1 + # via django-oauth-toolkit +pyyaml==6.0.1 + # via drf-spectacular +redis==5.0.6 + # via -r requirements.in +referencing==0.35.1 + # via + # jsonschema + # jsonschema-specifications +requests==2.32.3 + # via django-oauth-toolkit +rpds-py==0.18.1 + # via + # jsonschema + # referencing +six==1.16.0 + # via python-dateutil +sqlparse==0.5.0 # via django +typing-extensions==4.12.2 + # via + # jwcrypto + # psycopg +tzdata==2024.1 + # via celery uritemplate==4.1.1 # via drf-spectacular -urllib3==1.26.11 +urllib3==2.2.2 # via requests -vine==5.0.0 +vine==5.1.0 # via # amqp # celery # kombu -wcwidth==0.2.5 +wcwidth==0.2.13 # via prompt-toolkit -wrapt==1.14.1 - # via deprecated -zipp==3.8.1 - # via importlib-metadata -zope-event==4.5.0 +zope-event==5.0 # via gevent -zope-interface==5.4.0 +zope-interface==6.4.post2 # via gevent # The following packages are considered to be unsafe in a requirements file: