Skip to content

Commit a30fea6

Browse files
przepeckporlows1
authored andcommitted
Trivy updates (#4234)
### 🛠 Summary [CVS-187016](https://jira.devtools.intel.com/browse/CVS-187016) Update requirements for client and tests to resolve vulnerabilities detected by trivy. ### 🧪 Checklist - [ ] Unit tests added. - [ ] The documentation updated. - [ ] Change follows security best practices. ``
1 parent d97061f commit a30fea6

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -608,15 +608,15 @@ test_functional: venv
608608

609609
test_python_clients:
610610
@echo "Prepare docker image"
611-
@docker build . -f tests/python/Dockerfile -t python_client_test
611+
@docker build --build-arg http_proxy="$(http_proxy)" --build-arg https_proxy="$(https_proxy)" . -f tests/python/Dockerfile -t python_client_test
612612
@echo "Dropping test container if exist"
613613
@docker rm --force $(PYTHON_CLIENT_TEST_CONTAINER_NAME) || true
614614
@echo "Download models"
615615
@if [ ! -d "tests/python/models" ]; then cd tests/python && \
616616
mkdir models && \
617-
docker run -u $(id -u):$(id -g) -v ${PWD}/tests/python/models:/models openvino/ubuntu20_dev:2024.6.0 omz_downloader --name resnet-50-tf --output_dir /models && \
618-
docker run -u $(id -u):$(id -g) -v ${PWD}/tests/python/models:/models:rw openvino/ubuntu20_dev:2024.6.0 omz_converter --name resnet-50-tf --download_dir /models --output_dir /models --precisions FP32 && \
619-
docker run -u $(id -u):$(id -g) -v ${PWD}/tests/python/models:/models:rw openvino/ubuntu20_dev:2024.6.0 mv /models/public/resnet-50-tf/FP32 /models/public/resnet-50-tf/1; fi
617+
docker run -u $(id -u):$(id -g) -e http_proxy="$(http_proxy)" -e https_proxy="$(https_proxy)" -v ${PWD}/tests/python/models:/models openvino/ubuntu20_dev:2024.6.0 omz_downloader --name resnet-50-tf --output_dir /models && \
618+
docker run -u $(id -u):$(id -g) -e http_proxy="$(http_proxy)" -e https_proxy="$(https_proxy)" -v ${PWD}/tests/python/models:/models:rw openvino/ubuntu20_dev:2024.6.0 omz_converter --name resnet-50-tf --download_dir /models --output_dir /models --precisions FP32 && \
619+
docker run -u $(id -u):$(id -g) -e http_proxy="$(http_proxy)" -e https_proxy="$(https_proxy)" -v ${PWD}/tests/python/models:/models:rw openvino/ubuntu20_dev:2024.6.0 mv /models/public/resnet-50-tf/FP32 /models/public/resnet-50-tf/1; fi
620620
@echo "Start test container"
621621
@docker run -d --rm --name $(PYTHON_CLIENT_TEST_CONTAINER_NAME) -v ${PWD}/tests/python/models/public/resnet-50-tf:/models/public/resnet-50-tf -p $(PYTHON_CLIENT_TEST_REST_PORT):8000 -p $(PYTHON_CLIENT_TEST_GRPC_PORT):9000 openvino/model_server:latest --model_name resnet --model_path /models/public/resnet-50-tf --port 9000 --rest_port 8000 && \
622622
sleep 10
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
tensorflow-serving-api==2.16.1
2-
tensorflow==2.16.1
1+
tensorflow-serving-api>=2.16.1
2+
tensorflow>=2.16.1
33
protobuf<=5.29.6

tests/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ boto3==1.33.13
22
checksec-py==0.7.4
33
docker==7.1.0
44
grpcio==1.60.0
5-
paramiko==3.4.0
5+
paramiko==5.0.0
66
psutil==5.9.6
77
pytest==9.0.3
88
pytest-json==0.4.0
9-
tensorflow-serving-api==2.16.1
10-
tensorflow==2.16.1
9+
tensorflow-serving-api>=2.16.1
10+
tensorflow>=2.16.1
1111
requests==2.33.0
1212
retry==0.9.2
1313
protobuf<=5.29.6

0 commit comments

Comments
 (0)