Merge pull request #441 from maykinmedia/feature/50-last-security-issues

⬆️ [#50] updated setuptools in Dockerfile, fixed npm vulnerabilities
maykinmedia · Aug 28, 2024 · 49eb405 · 49eb405
2 parents 0093d9f + 7c6ddc2
commit 49eb405
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 29 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 WORKDIR /app
 
 COPY ./requirements /app/requirements
-RUN pip install pip --upgrade
+RUN pip install pip "setuptools>=70.0.0"
 RUN pip install -r requirements/production.txt
 
 
@@ -45,6 +45,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         libgdal-dev \
     && rm -rf /var/lib/apt/lists/*
 
+RUN pip install pip "setuptools>=70.0.0"
+
 COPY --from=backend-build /usr/local/lib/python3.11 /usr/local/lib/python3.11
 COPY --from=backend-build /usr/local/bin/uwsgi /usr/local/bin/uwsgi
 COPY --from=backend-build /usr/local/bin/celery /usr/local/bin/celery

diff --git a/package-lock.json b/package-lock.json