From a69e1228ac8ab120ca9f1274348e83ddcb89d4be Mon Sep 17 00:00:00 2001
From: Andrey Zhavoronkov <andrey@cvat.ai>
Date: Fri, 16 Aug 2024 14:06:44 +0300
Subject: [PATCH] Update dependencies (#8308)

Updated:
  backend python packages
  golang image
  frontend nginx base image
---
 Dockerfile                        |  4 ++--
 Dockerfile.ui                     |  3 ++-
 cvat/requirements/base.txt        | 18 +++++++++---------
 cvat/requirements/development.txt |  4 ++--
 cvat/requirements/production.txt  |  2 +-
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b094a134aa2e..b4f2b8ef2545 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 ARG PIP_VERSION=24.0
 ARG BASE_IMAGE=ubuntu:22.04
 
-FROM ${BASE_IMAGE} as build-image-base
+FROM ${BASE_IMAGE} AS build-image-base
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends install -yq \
@@ -84,7 +84,7 @@ RUN --mount=type=cache,target=/root/.cache/pip/http-v2 \
     -r /tmp/cvat/requirements/${CVAT_CONFIGURATION}.txt \
     -w /tmp/wheelhouse
 
-FROM golang:1.22.4 AS build-smokescreen
+FROM golang:1.23.0 AS build-smokescreen
 
 RUN git clone --filter=blob:none --no-checkout https://github.com/stripe/smokescreen.git
 RUN cd smokescreen && git checkout eb1ac09 && go build -o /tmp/smokescreen
diff --git a/Dockerfile.ui b/Dockerfile.ui
index 9de104298460..170ee1a76633 100644
--- a/Dockerfile.ui
+++ b/Dockerfile.ui
@@ -34,7 +34,8 @@ DISABLE_SOURCE_MAPS="${DISABLE_SOURCE_MAPS}" \
 UI_APP_CONFIG="${UI_APP_CONFIG}" \
 SOURCE_MAPS_TOKEN="${SOURCE_MAPS_TOKEN}" yarn run build:cvat-ui
 
-FROM nginx:1.25.4-alpine3.18
+FROM nginx:1.26.1-alpine3.19-slim
+
 # Replace default.conf configuration to remove unnecessary rules
 COPY cvat-ui/react_nginx.conf /etc/nginx/conf.d/default.conf
 COPY --from=cvat-ui /tmp/cvat-ui/dist /usr/share/nginx/html/
diff --git a/cvat/requirements/base.txt b/cvat/requirements/base.txt
index 470506abae87..4e4130de921a 100644
--- a/cvat/requirements/base.txt
+++ b/cvat/requirements/base.txt
@@ -35,7 +35,7 @@ certifi==2024.7.4
     #   clickhouse-connect
     #   msrest
     #   requests
-cffi==1.16.0
+cffi==1.17.0
     # via cryptography
 charset-normalizer==3.3.2
     # via requests
@@ -69,7 +69,7 @@ dj-pagination==2.5.0
     # via -r cvat/requirements/base.in
 dj-rest-auth[with-social]==5.0.2
     # via -r cvat/requirements/base.in
-django==4.2.14
+django==4.2.15
     # via
     #   -r cvat/requirements/base.in
     #   dj-rest-auth
@@ -127,7 +127,7 @@ google-api-core==2.19.1
     # via
     #   google-cloud-core
     #   google-cloud-storage
-google-auth==2.32.0
+google-auth==2.33.0
     # via
     #   google-api-core
     #   google-cloud-core
@@ -138,7 +138,7 @@ google-cloud-storage==1.42.0
     # via -r cvat/requirements/base.in
 google-crc32c==1.5.0
     # via google-resumable-media
-google-resumable-media==2.7.1
+google-resumable-media==2.7.2
     # via google-cloud-storage
 googleapis-common-protos==1.63.2
     # via google-api-core
@@ -148,7 +148,7 @@ idna==3.7
     # via requests
 importlib-metadata==8.2.0
     # via clickhouse-connect
-importlib-resources==6.4.0
+importlib-resources==6.4.2
     # via limits
 inflection==0.5.1
     # via drf-spectacular
@@ -170,7 +170,7 @@ kiwisolver==1.4.5
     # via matplotlib
 limits==3.13.0
     # via python-logstash-async
-lxml==5.2.2
+lxml==5.3.0
     # via
     #   -r cvat/requirements/base.in
     #   datumaro
@@ -196,7 +196,7 @@ oauthlib==3.2.2
     # via requests-oauthlib
 orderedmultidict==1.0.1
     # via furl
-orjson==3.10.6
+orjson==3.10.7
     # via datumaro
 packaging==24.1
     # via
@@ -269,7 +269,7 @@ pytz==2024.1
     #   pandas
 pyunpack==0.2.1
     # via -r cvat/requirements/base.in
-pyyaml==6.0.1
+pyyaml==6.0.2
     # via
     #   datumaro
     #   drf-spectacular
@@ -355,7 +355,7 @@ xmlsec==1.3.14
     # via
     #   -r cvat/requirements/base.in
     #   python3-saml
-zipp==3.19.2
+zipp==3.20.0
     # via importlib-metadata
 zstandard==0.23.0
     # via clickhouse-connect
diff --git a/cvat/requirements/development.txt b/cvat/requirements/development.txt
index 6417758d86cc..63f262430eb1 100644
--- a/cvat/requirements/development.txt
+++ b/cvat/requirements/development.txt
@@ -57,11 +57,11 @@ tomli==2.0.1
     #   autopep8
     #   black
     #   pylint
-tomlkit==0.13.0
+tomlkit==0.13.2
     # via pylint
 tornado==6.4.1
     # via snakeviz
 
 # The following packages are considered to be unsafe in a requirements file:
-setuptools==72.1.0
+setuptools==72.2.0
     # via astroid
diff --git a/cvat/requirements/production.txt b/cvat/requirements/production.txt
index 0c76e5e57e12..0659df392c9e 100644
--- a/cvat/requirements/production.txt
+++ b/cvat/requirements/production.txt
@@ -27,7 +27,7 @@ uvicorn[standard]==0.22.0
     # via -r cvat/requirements/production.in
 uvloop==0.19.0
     # via uvicorn
-watchfiles==0.22.0
+watchfiles==0.23.0
     # via uvicorn
 websockets==12.0
     # via uvicorn