Merge branch 'branch-25.02' into remove-pe-count-from-monitor-stage

.dockerignore

@@ -14,3 +14,6 @@
 docker/commands.sh
 *.egg-info/
 kafka-docker
+
+# Ignore the models docker files
+models/docker

ci/release/update-version.sh

@@ -115,9 +115,6 @@ sed_runner "s/${CURRENT_SHORT_TAG}/${NEXT_SHORT_TAG}/g" docs/source/getting_star
 sed_runner "s|blob/branch-${CURRENT_SHORT_TAG}|blob/branch-${NEXT_SHORT_TAG}|g" models/model-cards/*.md
 sed_runner "s|tree/branch-${CURRENT_SHORT_TAG}|tree/branch-${NEXT_SHORT_TAG}|g" models/model-cards/*.md
 
-# thirdparty
-sed_runner "s|tree/branch-${CURRENT_SHORT_TAG}|tree/branch-${NEXT_SHORT_TAG}|g" thirdparty/README.md
-
 # Update the version of the Morpheus model container
 # We need to update several files, however we need to avoid symlinks as well as the build and .cache directories
 DOCS_MD_FILES=$(find -P ./docs/source/ -type f -iname "*.md")

docker/entrypoint.sh

@@ -1,13 +1,13 @@
 #!/bin/bash --login
 # SPDX-FileCopyrightText: Copyright (c) 2021-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 # http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,5 +23,8 @@ conda activate morpheus
 SRC_FILE="/opt/docker/bin/entrypoint_source"
 [ -f "${SRC_FILE}" ] && source "${SRC_FILE}"
 
+THIRDPARTY_FILE="thirdparty/morpheus-container-thirdparty-oss.txt"
+[ -f "${THIRDPARTY_FILE}" ] && cat "${THIRDPARTY_FILE}"
+
 # Run whatever the user wants.
-exec "$@"
+exec "$@"

models/docker/Dockerfile

@@ -28,6 +28,9 @@ RUN apt update && \
     apt clean && \
     rm -rf /var/lib/apt/lists/*
 
+# Append our third party notice to the entrypoint message
+COPY "${MORPHEUS_ROOT_HOST}/thirdparty/models-container-thirdparty-oss.txt" "/opt/nvidia/entrypoint.d/80-morpheus-thirdparty-oss.txt"
+
 # Copy the model repository
 COPY "${MORPHEUS_ROOT_HOST}/models" "./models"
 

thirdparty/README.md

@@ -17,4 +17,4 @@ limitations under the License.
 
 # Source Code for OSS Packages in the NVIDIA Morpheus Docker container
 
-The source code for OSS packages which are included in the NVIDIA Morpheus Docker image is available at [https://github.com/nv-morpheus/morpheus_third_party_oss/tree/branch-25.02](https://github.com/nv-morpheus/morpheus_third_party_oss/tree/branch-25.02)
+The source code for OSS packages which are included in the NVIDIA Morpheus Docker containers are available at [https://github.com/nv-morpheus/morpheus_third_party_oss](https://github.com/nv-morpheus/morpheus_third_party_oss)

thirdparty/models-container-thirdparty-oss.txt

@@ -0,0 +1,7 @@
+
+===================================
+== Morpheus Triton Server Models ==
+===================================
+
+The source code for OSS packages which are included in the NVIDIA Morpheus Triton Server Models Docker container
+are available at https://github.com/nv-morpheus/morpheus_third_party_oss

thirdparty/morpheus-container-thirdparty-oss.txt

@@ -0,0 +1,8 @@
+
+==============
+== Morpheus ==
+==============
+
+The source code for OSS packages which are included in the NVIDIA Morpheus Docker container
+are available at https://github.com/nv-morpheus/morpheus_third_party_oss
+