Skip to content

Commit a69e122

Browse files
authored
Update dependencies (#8308)
Updated: backend python packages golang image frontend nginx base image
1 parent ac9ff33 commit a69e122

File tree

5 files changed

+16
-15
lines changed

5 files changed

+16
-15
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG PIP_VERSION=24.0
22
ARG BASE_IMAGE=ubuntu:22.04
33

4-
FROM ${BASE_IMAGE} as build-image-base
4+
FROM ${BASE_IMAGE} AS build-image-base
55

66
RUN apt-get update && \
77
DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends install -yq \
@@ -84,7 +84,7 @@ RUN --mount=type=cache,target=/root/.cache/pip/http-v2 \
8484
-r /tmp/cvat/requirements/${CVAT_CONFIGURATION}.txt \
8585
-w /tmp/wheelhouse
8686

87-
FROM golang:1.22.4 AS build-smokescreen
87+
FROM golang:1.23.0 AS build-smokescreen
8888

8989
RUN git clone --filter=blob:none --no-checkout https://github.com/stripe/smokescreen.git
9090
RUN cd smokescreen && git checkout eb1ac09 && go build -o /tmp/smokescreen

Dockerfile.ui

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ DISABLE_SOURCE_MAPS="${DISABLE_SOURCE_MAPS}" \
3434
UI_APP_CONFIG="${UI_APP_CONFIG}" \
3535
SOURCE_MAPS_TOKEN="${SOURCE_MAPS_TOKEN}" yarn run build:cvat-ui
3636

37-
FROM nginx:1.25.4-alpine3.18
37+
FROM nginx:1.26.1-alpine3.19-slim
38+
3839
# Replace default.conf configuration to remove unnecessary rules
3940
COPY cvat-ui/react_nginx.conf /etc/nginx/conf.d/default.conf
4041
COPY --from=cvat-ui /tmp/cvat-ui/dist /usr/share/nginx/html/

cvat/requirements/base.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ certifi==2024.7.4
3535
# clickhouse-connect
3636
# msrest
3737
# requests
38-
cffi==1.16.0
38+
cffi==1.17.0
3939
# via cryptography
4040
charset-normalizer==3.3.2
4141
# via requests
@@ -69,7 +69,7 @@ dj-pagination==2.5.0
6969
# via -r cvat/requirements/base.in
7070
dj-rest-auth[with-social]==5.0.2
7171
# via -r cvat/requirements/base.in
72-
django==4.2.14
72+
django==4.2.15
7373
# via
7474
# -r cvat/requirements/base.in
7575
# dj-rest-auth
@@ -127,7 +127,7 @@ google-api-core==2.19.1
127127
# via
128128
# google-cloud-core
129129
# google-cloud-storage
130-
google-auth==2.32.0
130+
google-auth==2.33.0
131131
# via
132132
# google-api-core
133133
# google-cloud-core
@@ -138,7 +138,7 @@ google-cloud-storage==1.42.0
138138
# via -r cvat/requirements/base.in
139139
google-crc32c==1.5.0
140140
# via google-resumable-media
141-
google-resumable-media==2.7.1
141+
google-resumable-media==2.7.2
142142
# via google-cloud-storage
143143
googleapis-common-protos==1.63.2
144144
# via google-api-core
@@ -148,7 +148,7 @@ idna==3.7
148148
# via requests
149149
importlib-metadata==8.2.0
150150
# via clickhouse-connect
151-
importlib-resources==6.4.0
151+
importlib-resources==6.4.2
152152
# via limits
153153
inflection==0.5.1
154154
# via drf-spectacular
@@ -170,7 +170,7 @@ kiwisolver==1.4.5
170170
# via matplotlib
171171
limits==3.13.0
172172
# via python-logstash-async
173-
lxml==5.2.2
173+
lxml==5.3.0
174174
# via
175175
# -r cvat/requirements/base.in
176176
# datumaro
@@ -196,7 +196,7 @@ oauthlib==3.2.2
196196
# via requests-oauthlib
197197
orderedmultidict==1.0.1
198198
# via furl
199-
orjson==3.10.6
199+
orjson==3.10.7
200200
# via datumaro
201201
packaging==24.1
202202
# via
@@ -269,7 +269,7 @@ pytz==2024.1
269269
# pandas
270270
pyunpack==0.2.1
271271
# via -r cvat/requirements/base.in
272-
pyyaml==6.0.1
272+
pyyaml==6.0.2
273273
# via
274274
# datumaro
275275
# drf-spectacular
@@ -355,7 +355,7 @@ xmlsec==1.3.14
355355
# via
356356
# -r cvat/requirements/base.in
357357
# python3-saml
358-
zipp==3.19.2
358+
zipp==3.20.0
359359
# via importlib-metadata
360360
zstandard==0.23.0
361361
# via clickhouse-connect

cvat/requirements/development.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ tomli==2.0.1
5757
# autopep8
5858
# black
5959
# pylint
60-
tomlkit==0.13.0
60+
tomlkit==0.13.2
6161
# via pylint
6262
tornado==6.4.1
6363
# via snakeviz
6464

6565
# The following packages are considered to be unsafe in a requirements file:
66-
setuptools==72.1.0
66+
setuptools==72.2.0
6767
# via astroid

cvat/requirements/production.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ uvicorn[standard]==0.22.0
2727
# via -r cvat/requirements/production.in
2828
uvloop==0.19.0
2929
# via uvicorn
30-
watchfiles==0.22.0
30+
watchfiles==0.23.0
3131
# via uvicorn
3232
websockets==12.0
3333
# via uvicorn

0 commit comments

Comments
 (0)