Skip to content

Commit fe239db

Browse files
authored
Cherry-picks for 25.02 (#8024)
1 parent fe2c742 commit fe239db

File tree

1 file changed

+19
-6
lines changed

1 file changed

+19
-6
lines changed

build.py

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@
7171
#
7272

7373
DEFAULT_TRITON_VERSION_MAP = {
74-
"release_version": "2.55.0dev",
75-
"triton_container_version": "25.02dev",
76-
"upstream_container_version": "25.01",
74+
"release_version": "2.55.0",
75+
"triton_container_version": "25.02",
76+
"upstream_container_version": "25.02",
7777
"ort_version": "1.20.1",
78-
"ort_openvino_version": "2024.5.0",
79-
"standalone_openvino_version": "2024.5.0",
78+
"ort_openvino_version": "2025.0.0",
79+
"standalone_openvino_version": "2025.0.0",
8080
"dcgm_version": "3.3.6",
8181
"vllm_version": "0.7.0",
8282
"rhel_py_version": "3.12.3",
@@ -1234,7 +1234,6 @@ def create_dockerfile_linux(
12341234
12351235
WORKDIR /opt/tritonserver
12361236
COPY --chown=1000:1000 NVIDIA_Deep_Learning_Container_License.pdf .
1237-
12381237
RUN find /opt/tritonserver/python -maxdepth 1 -type f -name \\
12391238
"tritonserver-*.whl" | xargs -I {} pip install --upgrade {}[all] && \\
12401239
find /opt/tritonserver/python -maxdepth 1 -type f -name \\
@@ -1819,6 +1818,14 @@ def create_docker_build_script(script_name, container_install_dir, container_ci_
18191818
runargs += ["-v", "\\\\.\pipe\docker_engine:\\\\.\pipe\docker_engine"]
18201819
else:
18211820
runargs += ["-v", "/var/run/docker.sock:/var/run/docker.sock"]
1821+
if FLAGS.use_user_docker_config:
1822+
if os.path.exists(FLAGS.use_user_docker_config):
1823+
runargs += [
1824+
"-v",
1825+
os.path.expanduser(
1826+
FLAGS.use_user_docker_config + ":/root/.docker/config.json"
1827+
),
1828+
]
18221829

18231830
runargs += ["tritonserver_buildbase"]
18241831

@@ -2418,6 +2425,12 @@ def enable_all():
24182425
required=False,
24192426
help="Do not use Docker container for build.",
24202427
)
2428+
parser.add_argument(
2429+
"--use-user-docker-config",
2430+
default=None,
2431+
required=False,
2432+
help="Path to the Docker configuration file to be used when performing container build.",
2433+
)
24212434
parser.add_argument(
24222435
"--no-container-interactive",
24232436
action="store_true",

0 commit comments

Comments
 (0)