From f4295df8c41cdb8b25de6731a81c117991163c13 Mon Sep 17 00:00:00 2001 From: Eli Fajardo Date: Wed, 12 Apr 2023 19:59:17 +0000 Subject: [PATCH 1/4] add dfp viz dependencies to dfp container --- examples/digital_fingerprinting/production/Dockerfile | 10 ++++++++++ .../digital_fingerprinting/visualization/README.md | 9 --------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/examples/digital_fingerprinting/production/Dockerfile b/examples/digital_fingerprinting/production/Dockerfile index fbf59dd812..f0d40de995 100644 --- a/examples/digital_fingerprinting/production/Dockerfile +++ b/examples/digital_fingerprinting/production/Dockerfile @@ -26,6 +26,16 @@ SHELL ["/bin/bash", "-c"] # Set the workdir to the DFP base folder WORKDIR /workspace/examples/digital_fingerprinting/ +# Install Node.js for DFP Viz +RUN apt-get update \ + && apt-get upgrade -y \ + && curl -sL https://deb.nodesource.com/setup_16.x | bash - \ + && apt-get install --no-install-recommends -y nodejs \ + && rm -rf /var/lib/apt/lists/* + +# Add library path where DFP Viz can find libnvrtc +ENV LD_LIBRARY_PATH=/opt/conda/envs/morpheus/lib:$LD_LIBRARY_PATH + # Copy the conda_env file COPY ./conda_env.yml ./ diff --git a/examples/digital_fingerprinting/visualization/README.md b/examples/digital_fingerprinting/visualization/README.md index cdc12f2742..645f3a6b1b 100644 --- a/examples/digital_fingerprinting/visualization/README.md +++ b/examples/digital_fingerprinting/visualization/README.md @@ -139,15 +139,6 @@ While still in the `morpheus_pipeline` container, perform the following steps to ### Install dependencies -``` -# Install Node.js -apt update -curl -sL https://deb.nodesource.com/setup_16.x | bash -apt install nodejs -``` -``` -export LD_LIBRARY_PATH=/opt/conda/envs/morpheus/lib:${LD_LIBRARY_PATH} -``` ``` cd viz ``` From 2fddaf0d96a20b3a415f82c13675da38af5884bd Mon Sep 17 00:00:00 2001 From: Eli Fajardo Date: Thu, 13 Apr 2023 18:16:58 +0000 Subject: [PATCH 2/4] conda install nodejs --- examples/digital_fingerprinting/production/Dockerfile | 7 ------- examples/digital_fingerprinting/production/conda_env.yml | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/examples/digital_fingerprinting/production/Dockerfile b/examples/digital_fingerprinting/production/Dockerfile index f0d40de995..ae9c346c59 100644 --- a/examples/digital_fingerprinting/production/Dockerfile +++ b/examples/digital_fingerprinting/production/Dockerfile @@ -26,13 +26,6 @@ SHELL ["/bin/bash", "-c"] # Set the workdir to the DFP base folder WORKDIR /workspace/examples/digital_fingerprinting/ -# Install Node.js for DFP Viz -RUN apt-get update \ - && apt-get upgrade -y \ - && curl -sL https://deb.nodesource.com/setup_16.x | bash - \ - && apt-get install --no-install-recommends -y nodejs \ - && rm -rf /var/lib/apt/lists/* - # Add library path where DFP Viz can find libnvrtc ENV LD_LIBRARY_PATH=/opt/conda/envs/morpheus/lib:$LD_LIBRARY_PATH diff --git a/examples/digital_fingerprinting/production/conda_env.yml b/examples/digital_fingerprinting/production/conda_env.yml index e1f6130f71..70b72d08a5 100644 --- a/examples/digital_fingerprinting/production/conda_env.yml +++ b/examples/digital_fingerprinting/production/conda_env.yml @@ -28,5 +28,6 @@ dependencies: - kfp - librdkafka - mlflow>1.29.0,<2 + - nodejs=17.4.0 - papermill - s3fs==2022.8.2 From be56fc0ac8414cc77aa2c12608f08ce1f0a1c238 Mon Sep 17 00:00:00 2001 From: Eli Fajardo Date: Fri, 28 Apr 2023 23:25:01 +0000 Subject: [PATCH 3/4] remove ld_library_path hack from dockerfile --- examples/digital_fingerprinting/production/Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/examples/digital_fingerprinting/production/Dockerfile b/examples/digital_fingerprinting/production/Dockerfile index ae9c346c59..fbf59dd812 100644 --- a/examples/digital_fingerprinting/production/Dockerfile +++ b/examples/digital_fingerprinting/production/Dockerfile @@ -26,9 +26,6 @@ SHELL ["/bin/bash", "-c"] # Set the workdir to the DFP base folder WORKDIR /workspace/examples/digital_fingerprinting/ -# Add library path where DFP Viz can find libnvrtc -ENV LD_LIBRARY_PATH=/opt/conda/envs/morpheus/lib:$LD_LIBRARY_PATH - # Copy the conda_env file COPY ./conda_env.yml ./ From 3a9dcd2e66fb275f9956e274dbdf62c17a66f1f8 Mon Sep 17 00:00:00 2001 From: Eli Fajardo Date: Mon, 1 May 2023 19:23:11 +0000 Subject: [PATCH 4/4] update viz submodule --- external/morpheus-visualizations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/morpheus-visualizations b/external/morpheus-visualizations index 32e387ac41..a006d1e7ca 160000 --- a/external/morpheus-visualizations +++ b/external/morpheus-visualizations @@ -1 +1 @@ -Subproject commit 32e387ac419a1308f916aa1450cf1374e0a75a82 +Subproject commit a006d1e7ca2856cb290225632e05daa7030ea7aa