diff --git a/constraints.txt b/constraints.txt index eb4479437e4..160cf2a751f 100644 --- a/constraints.txt +++ b/constraints.txt @@ -7,3 +7,7 @@ h11>=0.16.0 tornado>=6.5.0 # WAR against https://github.com/advisories/GHSA-5rjg-fvgr-3xxf setuptools>=78.1.1 +# WAR against https://github.com/advisories/GHSA-8qvm-5x2c-j2w7 +protobuf>=4.25.8 +# WAR against https://github.com/advisories/GHSA-33p9-3p43-82vq +jupyter-core>=5.8.1 diff --git a/docker/Dockerfile.multi b/docker/Dockerfile.multi index b456be578da..a8ee5da002e 100644 --- a/docker/Dockerfile.multi +++ b/docker/Dockerfile.multi @@ -75,10 +75,14 @@ RUN pip3 install opencv-python-headless --force-reinstall --no-deps --no-cache-d # * https://github.com/advisories/GHSA-vqfr-h8mv-ghfj # * https://github.com/advisories/GHSA-7cx3-6m66-7c5m # * https://github.com/advisories/GHSA-5rjg-fvgr-3xxf +# * https://github.com/advisories/GHSA-8qvm-5x2c-j2w7 +# * https://github.com/advisories/GHSA-33p9-3p43-82vq RUN pip3 install --upgrade --no-cache-dir \ "h11>=0.16" \ "tornado>=6.5.0" \ - "setuptools>=78.1.1,<80" + "setuptools>=78.1.1,<80" \ + "protobuf>=4.25.8" \ + "jupyter-core>=5.8.1" FROM ${TRITON_IMAGE}:${TRITON_BASE_TAG} AS triton diff --git a/docker/common/install_tensorrt.sh b/docker/common/install_tensorrt.sh index 88f60a62272..bff9803691a 100644 --- a/docker/common/install_tensorrt.sh +++ b/docker/common/install_tensorrt.sh @@ -138,6 +138,14 @@ install_tensorrt() { pip3 install --no-cache-dir /usr/local/tensorrt/python/tensorrt-*-cp${PARSED_PY_VERSION}-*.whl rm -rf /tmp/TensorRT.tar echo 'export LD_LIBRARY_PATH=/usr/local/tensorrt/lib:$LD_LIBRARY_PATH' >> "${ENV}" + + rm -f /usr/local/tensorrt/lib/libnvinfer_vc_plugin_static.a \ + /usr/local/tensorrt/lib/libnvinfer_plugin_static.a \ + /usr/local/tensorrt/lib/libnvinfer_static.a \ + /usr/local/tensorrt/lib/libnvinfer_dispatch_static.a \ + /usr/local/tensorrt/lib/libnvinfer_lean_static.a \ + /usr/local/tensorrt/lib/libnvonnxparser_static.a \ + /usr/local/tensorrt/lib/libnvinfer_builder_resource_win.so.10.10.0 } # Install base packages depending on the base OS diff --git a/jenkins/current_image_tags.properties b/jenkins/current_image_tags.properties index 2b3e72aa153..11552a7f131 100644 --- a/jenkins/current_image_tags.properties +++ b/jenkins/current_image_tags.properties @@ -8,7 +8,7 @@ # NB: Although string interpolation is supported, redundant substrings are # kept in the variables below for interoperability with # scripts/rename_docker_images.py -LLM_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:pytorch-25.05-py3-x86_64-ubuntu24.04-trt10.11.0.33-skip-tritondevel-202507071100-5534 -LLM_SBSA_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:pytorch-25.05-py3-aarch64-ubuntu24.04-trt10.11.0.33-skip-tritondevel-202507071100-5534 -LLM_ROCKYLINUX8_PY310_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:cuda-12.9.0-devel-rocky8-x86_64-rocky8-py310-trt10.11.0.33-skip-tritondevel-202507071100-5534 -LLM_ROCKYLINUX8_PY312_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:cuda-12.9.0-devel-rocky8-x86_64-rocky8-py312-trt10.11.0.33-skip-tritondevel-202507071100-5534 +LLM_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:pytorch-25.05-py3-x86_64-ubuntu24.04-trt10.11.0.33-skip-tritondevel-202507101530-5434 +LLM_SBSA_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:pytorch-25.05-py3-aarch64-ubuntu24.04-trt10.11.0.33-skip-tritondevel-202507101530-5434 +LLM_ROCKYLINUX8_PY310_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:cuda-12.9.0-devel-rocky8-x86_64-rocky8-py310-trt10.11.0.33-skip-tritondevel-202507101530-5434 +LLM_ROCKYLINUX8_PY312_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:cuda-12.9.0-devel-rocky8-x86_64-rocky8-py312-trt10.11.0.33-skip-tritondevel-202507101530-5434