From a42900a1d411dd839a6c27cbd717c379f03e7161 Mon Sep 17 00:00:00 2001 From: Jason Du <171721794+jadu-nv@users.noreply.github.com> Date: Tue, 18 Jun 2024 10:11:54 -0700 Subject: [PATCH 1/3] Add GIT_CLONE_PROTECTION_ACTIVE env config to fix build script --- docker/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 492e4becae..d64d9b4909 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -188,6 +188,8 @@ ARG MORPHEUS_ROOT_HOST ARG CUDA_MAJOR_VER ARG CUDA_MINOR_VER +ENV GIT_CLONE_PROTECTION_ACTIVE=false + RUN --mount=type=cache,id=apt,target=/var/cache/apt \ apt update && \ DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC \ From c4ada9363a493ec877056aa164f7a0bb427e5161 Mon Sep 17 00:00:00 2001 From: Jason Du <171721794+jadu-nv@users.noreply.github.com> Date: Tue, 18 Jun 2024 11:34:20 -0700 Subject: [PATCH 2/3] Update tags to adhere to CI requirements --- CMakeLists.txt | 2 +- examples/digital_fingerprinting/production/Dockerfile | 2 +- examples/digital_fingerprinting/production/docker-compose.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f2658237ab..1dabba1914 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,7 +92,7 @@ morpheus_utils_initialize_cuda_arch(morpheus) # Note intentionally excluding CUDA from the LANGUAGES list allowing us to set some clang specific settings later when # we call morpheus_utils_enable_cuda() project(morpheus - VERSION 24.06.00 + VERSION 24.06.00rc1 LANGUAGES C CXX ) diff --git a/examples/digital_fingerprinting/production/Dockerfile b/examples/digital_fingerprinting/production/Dockerfile index 3f82511484..b683f333f1 100644 --- a/examples/digital_fingerprinting/production/Dockerfile +++ b/examples/digital_fingerprinting/production/Dockerfile @@ -14,7 +14,7 @@ # limitations under the License. ARG MORPHEUS_CONTAINER=nvcr.io/nvidia/morpheus/morpheus -ARG MORPHEUS_CONTAINER_VERSION=v24.06.00-runtime +ARG MORPHEUS_CONTAINER_VERSION=v24.06.00rc1-runtime FROM ${MORPHEUS_CONTAINER}:${MORPHEUS_CONTAINER_VERSION} as base diff --git a/examples/digital_fingerprinting/production/docker-compose.yml b/examples/digital_fingerprinting/production/docker-compose.yml index c153454f53..dfea32b95b 100644 --- a/examples/digital_fingerprinting/production/docker-compose.yml +++ b/examples/digital_fingerprinting/production/docker-compose.yml @@ -77,7 +77,7 @@ services: target: jupyter args: - MORPHEUS_CONTAINER=${MORPHEUS_CONTAINER:-nvcr.io/nvidia/morpheus/morpheus} - - MORPHEUS_CONTAINER_VERSION=${MORPHEUS_CONTAINER_VERSION:-v24.06.00-runtime} + - MORPHEUS_CONTAINER_VERSION=${MORPHEUS_CONTAINER_VERSION:-v24.06.00rc1-runtime} deploy: resources: reservations: @@ -109,7 +109,7 @@ services: target: runtime args: - MORPHEUS_CONTAINER=${MORPHEUS_CONTAINER:-nvcr.io/nvidia/morpheus/morpheus} - - MORPHEUS_CONTAINER_VERSION=${MORPHEUS_CONTAINER_VERSION:-v24.06.00-runtime} + - MORPHEUS_CONTAINER_VERSION=${MORPHEUS_CONTAINER_VERSION:-v24.06.00rc1-runtime} image: dfp_morpheus container_name: morpheus_pipeline deploy: From d70c395adf34ab17c3b713de34138f585d7d44d2 Mon Sep 17 00:00:00 2001 From: Jason Du <171721794+jadu-nv@users.noreply.github.com> Date: Tue, 25 Jun 2024 11:13:24 -0700 Subject: [PATCH 3/3] Revert changes made to morpheus version --- CMakeLists.txt | 2 +- examples/digital_fingerprinting/production/Dockerfile | 2 +- examples/digital_fingerprinting/production/docker-compose.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1dabba1914..f2658237ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,7 +92,7 @@ morpheus_utils_initialize_cuda_arch(morpheus) # Note intentionally excluding CUDA from the LANGUAGES list allowing us to set some clang specific settings later when # we call morpheus_utils_enable_cuda() project(morpheus - VERSION 24.06.00rc1 + VERSION 24.06.00 LANGUAGES C CXX ) diff --git a/examples/digital_fingerprinting/production/Dockerfile b/examples/digital_fingerprinting/production/Dockerfile index b683f333f1..3f82511484 100644 --- a/examples/digital_fingerprinting/production/Dockerfile +++ b/examples/digital_fingerprinting/production/Dockerfile @@ -14,7 +14,7 @@ # limitations under the License. ARG MORPHEUS_CONTAINER=nvcr.io/nvidia/morpheus/morpheus -ARG MORPHEUS_CONTAINER_VERSION=v24.06.00rc1-runtime +ARG MORPHEUS_CONTAINER_VERSION=v24.06.00-runtime FROM ${MORPHEUS_CONTAINER}:${MORPHEUS_CONTAINER_VERSION} as base diff --git a/examples/digital_fingerprinting/production/docker-compose.yml b/examples/digital_fingerprinting/production/docker-compose.yml index dfea32b95b..c153454f53 100644 --- a/examples/digital_fingerprinting/production/docker-compose.yml +++ b/examples/digital_fingerprinting/production/docker-compose.yml @@ -77,7 +77,7 @@ services: target: jupyter args: - MORPHEUS_CONTAINER=${MORPHEUS_CONTAINER:-nvcr.io/nvidia/morpheus/morpheus} - - MORPHEUS_CONTAINER_VERSION=${MORPHEUS_CONTAINER_VERSION:-v24.06.00rc1-runtime} + - MORPHEUS_CONTAINER_VERSION=${MORPHEUS_CONTAINER_VERSION:-v24.06.00-runtime} deploy: resources: reservations: @@ -109,7 +109,7 @@ services: target: runtime args: - MORPHEUS_CONTAINER=${MORPHEUS_CONTAINER:-nvcr.io/nvidia/morpheus/morpheus} - - MORPHEUS_CONTAINER_VERSION=${MORPHEUS_CONTAINER_VERSION:-v24.06.00rc1-runtime} + - MORPHEUS_CONTAINER_VERSION=${MORPHEUS_CONTAINER_VERSION:-v24.06.00-runtime} image: dfp_morpheus container_name: morpheus_pipeline deploy: