Skip to content

Commit f3b3193

Browse files
committed
Merge branch-25.02 into branch-25.06
2 parents 2226afe + 4f2ed4f commit f3b3193

File tree

14 files changed

+37
-1032
lines changed

14 files changed

+37
-1032
lines changed

.dockerignore

+3
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,6 @@
1414
docker/commands.sh
1515
*.egg-info/
1616
kafka-docker
17+
18+
# Ignore the models docker files
19+
models/docker

README.md

-4
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,4 @@ NVIDIA Morpheus is an open AI application framework that provides cybersecurity
3434
### Modifying Morpheus
3535
* [Contributing to Morpheus](./docs/source/developer_guide/contributing.md) - Covers building from source, making changes and contributing to Morpheus
3636

37-
### Deploying Morpheus
38-
* [Morpheus Cloud Deployment Guide](./docs/source/cloud_deployment_guide.md) - Kubernetes and cloud based deployments
39-
40-
4137
Full documentation for the latest official release is available at [https://docs.nvidia.com/morpheus/](https://docs.nvidia.com/morpheus/).

ci/release/download_deps.py

-226
This file was deleted.

ci/release/update-version.sh

-8
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,6 @@ sed_runner 's/'"VERSION ${CURRENT_FULL_VERSION}.*"'/'"VERSION ${NEXT_FULL_VERSIO
101101
# docs/source/basics/overview.rst
102102
sed_runner "s|blob/branch-${CURRENT_SHORT_TAG}|blob/branch-${NEXT_SHORT_TAG}|g" docs/source/basics/overview.rst
103103

104-
# docs/source/cloud_deployment_guide.md
105-
sed_runner "s|${CURRENT_SHORT_TAG}.tgz|${NEXT_SHORT_TAG}.tgz|g" docs/source/cloud_deployment_guide.md
106-
sed_runner "s|blob/branch-${CURRENT_SHORT_TAG}|blob/branch-${NEXT_SHORT_TAG}|g" docs/source/cloud_deployment_guide.md
107-
sed_runner "s|tree/branch-${CURRENT_SHORT_TAG}|tree/branch-${NEXT_SHORT_TAG}|g" docs/source/cloud_deployment_guide.md
108-
109104
# docs/source/developer_guide/guides/5_digital_fingerprinting.md
110105
sed_runner "s|blob/branch-${CURRENT_SHORT_TAG}|blob/branch-${NEXT_SHORT_TAG}|g" docs/source/developer_guide/guides/5_digital_fingerprinting.md
111106

@@ -120,9 +115,6 @@ sed_runner "s/${CURRENT_SHORT_TAG}/${NEXT_SHORT_TAG}/g" docs/source/getting_star
120115
sed_runner "s|blob/branch-${CURRENT_SHORT_TAG}|blob/branch-${NEXT_SHORT_TAG}|g" models/model-cards/*.md
121116
sed_runner "s|tree/branch-${CURRENT_SHORT_TAG}|tree/branch-${NEXT_SHORT_TAG}|g" models/model-cards/*.md
122117

123-
# thirdparty
124-
sed_runner "s|tree/branch-${CURRENT_SHORT_TAG}|tree/branch-${NEXT_SHORT_TAG}|g" thirdparty/README.md
125-
126118
# Update the version of the Morpheus model container
127119
# We need to update several files, however we need to avoid symlinks as well as the build and .cache directories
128120
DOCS_MD_FILES=$(find -P ./docs/source/ -type f -iname "*.md")

docker/entrypoint.sh

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/bin/bash --login
22
# SPDX-FileCopyrightText: Copyright (c) 2021-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
# SPDX-License-Identifier: Apache-2.0
4-
#
4+
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
77
# You may obtain a copy of the License at
8-
#
8+
#
99
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
10+
#
1111
# Unless required by applicable law or agreed to in writing, software
1212
# distributed under the License is distributed on an "AS IS" BASIS,
1313
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,5 +23,8 @@ conda activate morpheus
2323
SRC_FILE="/opt/docker/bin/entrypoint_source"
2424
[ -f "${SRC_FILE}" ] && source "${SRC_FILE}"
2525

26+
THIRDPARTY_FILE="thirdparty/morpheus-container-thirdparty-oss.txt"
27+
[ -f "${THIRDPARTY_FILE}" ] && cat "${THIRDPARTY_FILE}"
28+
2629
# Run whatever the user wants.
27-
exec "$@"
30+
exec "$@"

0 commit comments

Comments
 (0)