From 3ff57b93ed29f11c360abd3faa498b287384345e Mon Sep 17 00:00:00 2001 From: Michael Demoret Date: Thu, 26 Sep 2024 15:57:46 -0400 Subject: [PATCH 1/3] Fixing the docker build when Morpheus is a submodule --- docker/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 4f69391258..92a54d52ce 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -295,12 +295,13 @@ FROM conda_env_dev as git_clone ARG MORPHEUS_ROOT_HOST # Source the morpheus env to pick up the git-lfs package -RUN --mount=type=bind,source=${MORPHEUS_ROOT_HOST},target=/opt/host_repo \ +RUN --mount=type=bind,source=.,target=/opt/host_repo \ source activate morpheus &&\ - git clone file:///opt/host_repo /tmp/morpheus_repo &&\ + # Use a local clone to allow unpushed commits to be included + git clone file:///opt/host_repo/${MORPHEUS_ROOT_HOST} /tmp/morpheus_repo &&\ cd /tmp/morpheus_repo &&\ git lfs install &&\ - /tmp/morpheus_repo/scripts/fetch_data.py fetch datasets examples + ./scripts/fetch_data.py fetch datasets examples # ============ Stage: runtime ============ # Setup container for runtime environment From 54bb9834d973ec62b3543396a5354e247781cdf6 Mon Sep 17 00:00:00 2001 From: Michael Demoret Date: Thu, 26 Sep 2024 16:29:36 -0400 Subject: [PATCH 2/3] Ensuring that we have the correct relative path for the docs --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 92a54d52ce..ecd2b3a53a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -312,7 +312,7 @@ ARG MORPHEUS_ROOT_HOST # Only copy specific files/folders over that are necessary for runtime COPY --from=git_clone "/tmp/morpheus_repo/conda/environments/*.yaml" "./conda/environments/" COPY --from=git_clone "/tmp/morpheus_repo/docker" "./docker" -COPY --from=build_docs "/workspace/build/docs/html" "./docs" +COPY --from=build_docs "/workspace/${MORPHEUS_ROOT_HOST}/build/docs/html" "./docs" COPY --from=git_clone "/tmp/morpheus_repo/examples" "./examples" COPY --from=git_clone "/tmp/morpheus_repo/models/datasets" "./models/datasets" COPY --from=git_clone "/tmp/morpheus_repo/scripts" "./scripts" From 3f62fdd0e2196b1a09a7fc5b0cc6a6a4d0edc052 Mon Sep 17 00:00:00 2001 From: Michael Demoret Date: Thu, 26 Sep 2024 17:16:55 -0400 Subject: [PATCH 3/3] Updating the conda install instructions to use miniforge since the existing link is broken --- docs/source/developer_guide/contributing.md | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/docs/source/developer_guide/contributing.md b/docs/source/developer_guide/contributing.md index 38439e9d43..22bca9fdd0 100644 --- a/docs/source/developer_guide/contributing.md +++ b/docs/source/developer_guide/contributing.md @@ -160,15 +160,7 @@ Note: These instructions assume the user is using `mamba` instead of `conda` sin - Volta architecture GPU or better - [CUDA 12.1](https://developer.nvidia.com/cuda-12-1-0-download-archive) - `conda` and `mamba` - - Refer to the [Getting Started Guide](https://conda.io/projects/conda/en/latest/user-guide/install/index.html) if `conda` is not already installed - - Install `mamba`: - - ```bash - conda activate base - conda install -c conda-forge mamba - ``` - - - **Note:** `mamba` should only be installed once in the base environment + - If `conda` and `mamba` are not installed, we recommend using the MiniForge install guide which is located [here](https://github.com/conda-forge/miniforge). This will install both `conda` and `mamba` and set the channel default to use `conda-forge`. 1. Set up environment variables and clone the repo: ```bash @@ -177,7 +169,7 @@ Note: These instructions assume the user is using `mamba` instead of `conda` sin cd $MORPHEUS_ROOT ``` -1. Ensure all submodules are checked out: +2. Ensure all submodules are checked out: ```bash git submodule update --init --recursive