From 8c32cfdab3eb3fe61dcef0f42a4c3a59fe84e0c0 Mon Sep 17 00:00:00 2001 From: urec56 Date: Fri, 11 Apr 2025 12:45:25 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=BA=D0=B5=D1=80=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B7?= =?UTF-8?q?,=20=D1=82=D0=B5=D1=81=D1=82=20ci/cd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/Dockerfile_back | 20 +++++++++++++++----- docker/Dockerfile_celery | 18 ++++++++++++++---- requirements.txt | 2 +- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/docker/Dockerfile_back b/docker/Dockerfile_back index 652e424..9422d7a 100644 --- a/docker/Dockerfile_back +++ b/docker/Dockerfile_back @@ -6,9 +6,19 @@ ENV APP_HOME=/home/app WORKDIR $APP_HOME -RUN apk add --no-cache \ - gcc \ - musl-dev +# RUN apk add --no-cache \ +# build-base \ +# python3-dev \ +# libffi-dev \ +# openssl-dev \ +# musl-dev \ +# gcc \ +# libc-dev + +# RUN apk update \ +# && apk add --no-cache gcc git python3-dev musl-dev linux-headers \ +# libc-dev rsync zsh \ +# findutils wget util-linux grep libxml2-dev libxslt-dev # RUN apt-get update \ # && apt-get -y install curl gcc libpq-dev \ @@ -17,7 +27,7 @@ RUN apk add --no-cache \ COPY requirements.txt . RUN pip config set global.trusted-host "pypi.python.org pypi.org files.pythonhosted.org" && \ - pip install --no-cache-dir -r requirements.txt + pip install --no-cache-dir -r requirements.txt COPY . . @@ -26,5 +36,5 @@ RUN chown -R app:app $APP_HOME USER app CMD ["gunicorn", "app.main:app", "--workers", "2", "--worker-class", "uvicorn.workers.UvicornWorker",\ - "--bind=0.0.0.0:8000", "--max-requests", "10000", "--max-requests-jitter", "20"] + "--bind=0.0.0.0:8000", "--max-requests", "10000", "--max-requests-jitter", "20"] diff --git a/docker/Dockerfile_celery b/docker/Dockerfile_celery index bc3959a..e9011a6 100644 --- a/docker/Dockerfile_celery +++ b/docker/Dockerfile_celery @@ -6,9 +6,19 @@ ENV APP_HOME=/home/app WORKDIR $APP_HOME -RUN apk add --no-cache \ - gcc \ - musl-dev +# RUN apk add --no-cache \ +# build-base \ +# python3-dev \ +# libffi-dev \ +# openssl-dev \ +# musl-dev \ +# gcc \ +# libc-dev + +# RUN apk update \ +# && apk add --no-cache gcc git python3-dev musl-dev linux-headers \ +# libc-dev rsync zsh \ +# findutils wget util-linux grep libxml2-dev libxslt-dev # RUN apt-get update \ # && apt-get -y install curl gcc libpq-dev \ @@ -17,7 +27,7 @@ RUN apk add --no-cache \ COPY requirements.txt . RUN pip config set global.trusted-host "pypi.python.org pypi.org files.pythonhosted.org" && \ - pip install --no-cache-dir -r requirements.txt + pip install --no-cache-dir -r requirements.txt COPY . . diff --git a/requirements.txt b/requirements.txt index c2ee545..2f7644e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -53,7 +53,7 @@ MarkupSafe==2.1.3 mccabe==0.7.0 mdurl==0.1.2 motor==3.5.1 -multidict==6.0.4 +multidict==6.0.5 mypy-extensions==1.0.0 nodeenv==1.8.0 orjson==3.9.15