Changed Dockerfile and requirements as per latest changes in 23.11 br…

…anch
pthalasta · Sep 1, 2023 · c0a2670 · c0a2670
1 parent 3aebcbb
commit c0a2670
Show file tree

Hide file tree

Showing 7 changed files with 266 additions and 114 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -15,70 +15,122 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# ============== LEGEND =================================================== #
+#                         [conda_bld_morpheus]
+#                               /
+# [base] -> [conda_env] -> [base_extended] -> [runtime]
+#                               \
+#                         [conda_env_dev] -> [development] -> [development_pydbg]
+#
+#  base: Contains all system packages common across all environments
+#  conda_env: Create morpheus conda environment and set it as the new base
+#  base_extended: Optional environmental elements, libraries, packages, etc.
+#  conda_env_dev: Full development environment with all necessary conda
+#    packages.
+#  conda_bld_morpheus: Utility stage used to build and cache the Morpheus
+#    conda package for runtime environments. (should not be extended)
+#  runtime: Full runtime environment with Morpheus installed as a conda
+#    package
+#  development: Full development environment able to build against a Morpheus
+#    source directory.
+#  development_pydbg: Development + debug build of cpython and various GDB
+#    debugging macros.
+# ========================================================================= #
 
 # Args used in FROM commands must come first
-ARG FROM_IMAGE="gpuci/miniforge-cuda"
-ARG CUDA_VER=11.5
+ARG FROM_IMAGE="nvidia/cuda"
+ARG CUDA_MAJOR_VER=11
+ARG CUDA_MINOR_VER=8
+ARG CUDA_REV_VER=0
 ARG LINUX_DISTRO=ubuntu
-ARG LINUX_VER=20.04
+ARG LINUX_VER=22.04
+
+# =====Global Options=====
+ARG PYTHON_VER=3.10
+# Allows running the docker build from a different directory than MORPHEUS_ROOT. Needed for using Morpheus in a
+# submodule
+ARG MORPHEUS_ROOT_HOST=.
+# Supply a channel alias to use for conda. This is needed if the conda channels go down
+ARG CONDA_CHANNEL_ALIAS="https://conda.anaconda.org"
 
 # ============ Stage: base ============
 # Configure the base conda environment
-FROM ${FROM_IMAGE}:${CUDA_VER}-devel-${LINUX_DISTRO}${LINUX_VER} AS base
+FROM ${FROM_IMAGE}:${CUDA_MAJOR_VER}.${CUDA_MINOR_VER}.${CUDA_REV_VER}-base-${LINUX_DISTRO}${LINUX_VER} AS base
 
-# Required arguments
-ARG IMAGE_TYPE=base
-ARG RAPIDS_CHANNEL=rapidsai-nightly
-ARG RAPIDS_VER=22.08
-ARG PYTHON_VER=3.8
-ARG CONDA_CHANNEL=rapidsai
-
-# Temp option to set conda channel_alias property during build
-ARG CONDA_CHANNEL_ALIAS
+ARG CUDA_MAJOR_VER
+ARG CUDA_MINOR_VER
+ARG PYTHON_VER
 
-# The TensorRT Version must be the full version (i.e. 7.2.2.3) and match Triton EXACTLY
-ARG TENSORRT_VERSION=8.2.1.3
+ENV DEBIAN_FRONTEND=noninteractive
 
-# Capture argument used for FROM
-ARG CUDA_VER
+# Remove the file which breaks apt caching since we will handle it ourselves. See
+# https://vsupalov.com/buildkit-cache-mount-dockerfile/
+RUN rm -f /etc/apt/apt.conf.d/docker-clean
 
 # Install dependencies to build
-RUN apt-get update &&\
+RUN --mount=type=cache,id=apt,target=/var/cache/apt \
+    apt-get update &&\
     apt-get upgrade -y &&\
-    DEBIAN_FRONTEND=noninteractive apt-get install -y openjdk-11-jre-headless &&\
-    curl -sL https://deb.nodesource.com/setup_16.x | bash - &&\
     apt-get install --no-install-recommends -y \
-        build-essential pkg-config curl unzip tar zip openssh-client bc jq nodejs git-lfs \
+        bc \
+        build-essential \
+        cuda-compiler-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        cuda-cudart-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        cuda-cupti-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        cuda-gdb-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        curl \
+        jq \
+        libcublas-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        libcufft-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        libcurand-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        libcusolver-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        libnuma1 \
+        openjdk-11-jre-headless \
+        openssh-client \
+        pkg-config \
+        tar \
+        unzip \
+        wget \
+        zip \
     && rm -rf /var/lib/apt/lists/*
 
 # Enables "source activate conda"
 SHELL ["/bin/bash", "-c"]
 
+ENV CUDA_PATH=/usr/local/cuda
+
 # All code will be under /workspace
 ENV MORPHEUS_ROOT=/workspace
 WORKDIR ${MORPHEUS_ROOT}
 
+COPY --from=condaforge/mambaforge:latest /opt/conda /opt/conda
+
+ENV PATH="${PATH}:/opt/conda/bin"
+
 # Install mamba to speed the solve up
-RUN conda config --set ssl_verify false &&\
+RUN --mount=type=cache,id=conda_pkgs,target=/opt/conda/pkgs,sharing=locked \
+    conda config --set ssl_verify false &&\
     conda config --add pkgs_dirs /opt/conda/pkgs &&\
-    conda config --env --add channels conda-forge &&\
     # Install mamba, boa and git here. Conda build breaks with other git installs
-    /opt/conda/bin/conda install -y -n base -c conda-forge "mamba >=0.22" "boa >=0.10" "git >=2.35.3" "git-lfs" "python=${PYTHON_VER}" &&\
-    source activate base &&\
-    git lfs install
+    /opt/conda/bin/mamba install -y -n base -c conda-forge "boa" "git >=2.35.3" "python=${PYTHON_VER}" "tini=0.19" &&\
+    source activate base
     # conda clean -afy
 
 # ============ Stage: conda_env ============
 # Create the conda environment and install all dependencies
 FROM base as conda_env
 
+ARG MORPHEUS_ROOT_HOST
+
 # Create a base environment
 RUN --mount=type=cache,id=conda_pkgs,target=/opt/conda/pkgs,sharing=locked \
     # Create the environment and install as little dependencies as possible
-    CONDA_ALWAYS_YES=true /opt/conda/bin/mamba create -n morpheus -c conda-forge python=${PYTHON_VER} &&\
+    CONDA_ALWAYS_YES=true /opt/conda/bin/mamba create -n morpheus -c conda-forge  \
+      python=${PYTHON_VER} && \
     # Clean and activate
     # conda clean -afy && \
-    sed -i 's/conda activate base/conda activate morpheus/g' ~/.bashrc
+    conda init bash && \
+    echo "conda activate morpheus" >> ~/.bashrc
 
 # Set the permenant conda channes to use for morpheus
 RUN source activate morpheus &&\
@@ -87,91 +139,161 @@ RUN source activate morpheus &&\
     conda config --env --add channels rapidsai
 
 # Set the entrypoint to use the entrypoint.sh script which sets the conda env
-COPY docker/entrypoint.sh ./docker/
+COPY ${MORPHEUS_ROOT_HOST}/docker/entrypoint.sh ./docker/
 ENTRYPOINT [ "/opt/conda/bin/tini", "--", "/workspace/docker/entrypoint.sh" ]
 
 # Reset the shell back to normal
 SHELL ["/bin/bash", "-c"]
 
+# ============ Stage: base_extended ============
+# Base environment with any optional extensions. ex. DOCA libs
+FROM conda_env as base_extended
+
+# Add one or more optional dependencies to the base environment
+ARG MORPHEUS_ROOT_HOST
+ARG MORPHEUS_SUPPORT_DOCA="FALSE"
+ARG DOCA_ARTIFACTS_HOST
+ARG DOCA_REPO_HOST
+ARG DOCA_BUILD_ID=7930666
+ARG DOCA_VERSION=2.2.0002-1
+ARG DPDK_VERSION=22.11.0-1.4.1
+
+# Set this environment variable so it auto builds DOCA
+ENV MORPHEUS_SUPPORT_DOCA=${MORPHEUS_SUPPORT_DOCA}
+
+# Copy all of the optional dependency scripts
+COPY ${MORPHEUS_ROOT_HOST}/docker/optional_deps docker/optional_deps
+
+# Install DOCA (If requested)
+RUN --mount=type=cache,id=doca,target=/tmp/doca,sharing=locked \
+    --mount=type=cache,id=apt,target=/var/cache/apt \
+    ./docker/optional_deps/doca.sh /tmp/doca
+
 # ============ Stage: conda_env_dev ============
 # Create the development conda environment
-FROM conda_env as conda_env_dev
+FROM base_extended as conda_env_dev
 
+ARG MORPHEUS_ROOT_HOST
+ARG CUDA_MAJOR_VER
+ARG CUDA_MINOR_VER
 ARG CONDA_CHANNEL_ALIAS
 
 # Copy the development dependencies file
-COPY docker/conda/environments/cuda${CUDA_VER}_dev.yml ./docker/conda/environments/
-COPY docker/conda/environments/requirements.txt ./docker/conda/environments/
+COPY ${MORPHEUS_ROOT_HOST}/docker/conda/environments/cuda${CUDA_MAJOR_VER}.${CUDA_MINOR_VER}_dev.yml ./docker/conda/environments/
 
 # Update the morpheus environment
 RUN --mount=type=cache,id=conda_pkgs,target=/opt/conda/pkgs,sharing=locked \
     # Temp add channel_alias to get around conda 404 errors
-    conda config --env --set channel_alias ${CONDA_CHANNEL_ALIAS:-"https://conda.anaconda.org"} &&\
-    /opt/conda/bin/mamba env update -n morpheus --file docker/conda/environments/cuda${CUDA_VER}_dev.yml &&\
+    conda config --env --set channel_alias ${CONDA_CHANNEL_ALIAS} &&\
+    /opt/conda/bin/mamba env update -n morpheus --file docker/conda/environments/cuda${CUDA_MAJOR_VER}.${CUDA_MINOR_VER}_dev.yml &&\
     # Remove channel_alias to use the normal channel in the container
     conda config --env --remove-key channel_alias &&\
     # Clean and activate
     conda clean -afy
 
 # ============ Stage: conda_bld_morpheus ============
 # Now build the morpheus conda package
-FROM base as conda_bld_morpheus
-
-ARG CONDA_CHANNEL_ALIAS
+FROM base_extended as conda_bld_morpheus
+
+ARG MORPHEUS_ROOT_HOST
+ARG CUDA_MAJOR_VER
+ARG CUDA_MINOR_VER
+
+RUN --mount=type=cache,id=apt,target=/var/cache/apt \
+    apt update && \
+    DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC \
+    apt install --no-install-recommends -y \
+        cuda-compiler-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        cuda-cudart-dev-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        cuda-cupti-dev-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        cuda-nvml-dev-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        cuda-nvtx-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        libcublas-dev-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        libcufft-dev-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        libcurand-dev-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        libcusolver-dev-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} && \
+    rm -rf /var/lib/apt/lists/*
 
 # Copy the source
 COPY . ./
 
 RUN --mount=type=cache,id=workspace_cache,target=/workspace/.cache,sharing=locked \
     --mount=type=cache,id=conda_pkgs,target=/opt/conda/pkgs,sharing=locked \
+    # Install git-lfs before running the build to avoid errors during conda build
+    /opt/conda/bin/mamba install -y -n base -c conda-forge "git-lfs" &&\
     source activate base &&\
+    git lfs install &&\
     # Need to get around recent versions of git locking paths until they are deemed safe
     git config --global --add safe.directory "*" &&\
-    MORPHEUS_BUILD_PYTHON_STUBS=OFF CONDA_BLD_PATH=/opt/conda/conda-bld CONDA_ARGS="--no-test" ./ci/conda/recipes/run_conda_build.sh morpheus
-
-# sid_visualization is a submodule we need to init
-RUN git submodule update --init --recursive
+    # Change to the morpheus directory and build the conda package
+    cd ${MORPHEUS_ROOT_HOST} &&\
+    MORPHEUS_PYTHON_BUILD_STUBS=OFF CONDA_BLD_PATH=/opt/conda/conda-bld ./ci/conda/recipes/run_conda_build.sh morpheus
 
 # ============ Stage: runtime ============
 # Setup container for runtime environment
-FROM conda_env as runtime
+FROM base_extended as runtime
 
-# Manually need to install some pip-only dependencies. Once these can get moved to conda, they can be removed.
-COPY docker/conda/environments/requirements.txt ./docker/conda/environments/
-COPY docker/conda/environments/cuda${CUDA_VER}_runtime.yml ./docker/conda/environments/
+ARG MORPHEUS_ROOT_HOST
+ARG CUDA_MAJOR_VER
+ARG CUDA_MINOR_VER
 
+COPY ${MORPHEUS_ROOT_HOST}/docker/conda/environments/cuda${CUDA_MAJOR_VER}.${CUDA_MINOR_VER}_runtime.yml ./docker/conda/environments/
+
+# Mount Morpheus conda package build in `conda_bld_morpheus`
 RUN --mount=type=bind,from=conda_bld_morpheus,source=/opt/conda/conda-bld,target=/opt/conda/conda-bld \
     --mount=type=cache,id=conda_pkgs,target=/opt/conda/pkgs,sharing=locked \
+    # CVE-2018-20225 for the base pip, not the env one
+    # conda will ignore the request to remove pip
+    python -m pip uninstall -y pip && \
     source activate morpheus &&\
     # Install morpheus
-    CONDA_ALWAYS_YES=true /opt/conda/bin/mamba install -n morpheus -c local -c rapidsai -c nvidia -c nvidia/label/dev -c conda-forge morpheus &&\
-    # Install runtime dependencies that are pip-only
-    /opt/conda/bin/mamba env update -n morpheus --file docker/conda/environments/cuda${CUDA_VER}_runtime.yml &&\
-    # Clean and activate
-    conda clean -afy
+    CONDA_ALWAYS_YES=true /opt/conda/bin/mamba install -n morpheus \
+        -c local \
+        -c rapidsai \
+        -c nvidia/label/cuda-11.8.0 \
+        -c nvidia/label/dev \
+        -c nvidia \
+        -c pytorch \
+        -c conda-forge morpheus &&\
+    /opt/conda/bin/mamba env update -n morpheus --file docker/conda/environments/cuda${CUDA_MAJOR_VER}.${CUDA_MINOR_VER}_runtime.yml
 
 # Only copy specific files/folders over that are necessary for runtime
-COPY "./docker" "./docker"
-COPY "./docs" "./docs"
-COPY "./examples" "./examples"
-COPY "./models" "./models"
-COPY "./scripts" "./scripts"
-COPY ["*.md", "LICENSE", "./"]
-
-# remedy for CVE-2015-20107
-RUN find / -name '*mailcap*.*py*' | xargs rm
+COPY "${MORPHEUS_ROOT_HOST}/docker" "./docker"
+COPY "${MORPHEUS_ROOT_HOST}/docs" "./docs"
+COPY "${MORPHEUS_ROOT_HOST}/examples" "./examples"
+COPY "${MORPHEUS_ROOT_HOST}/models" "./models"
+COPY "${MORPHEUS_ROOT_HOST}/scripts" "./scripts"
+COPY ["${MORPHEUS_ROOT_HOST}/*.md", "${MORPHEUS_ROOT_HOST}/LICENSE", "./"]
 
 # Use morpheus by default
 CMD [ "morpheus" ]
 
 # ============ Stage: development ============
 # Install and configure development only packages
 FROM conda_env_dev as development
-# Copy the source
-# COPY . ./
+
+ARG CUDA_MAJOR_VER
+ARG CUDA_MINOR_VER
+
+RUN --mount=type=cache,id=apt,target=/var/cache/apt \
+    apt update && \
+    TZ=Etc/UTC \
+    apt install --no-install-recommends -y \
+        cuda-compiler-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        cuda-cudart-dev-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        cuda-cupti-dev-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        cuda-nvtx-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        libcublas-dev-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        libcufft-dev-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        libcurand-dev-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} \
+        libcusolver-dev-${CUDA_MAJOR_VER}-${CUDA_MINOR_VER} && \
+    rm -rf /var/lib/apt/lists/*
 
 # Install camouflage needed for unittests to mock a triton server
-RUN npm install -g camouflage-server@0.9
+# Pin to v0.9 until #967 is resolved
+RUN source activate morpheus && \
+    npm install -g camouflage-server@0.9 && \
+    npm cache clean --force
 
 # Setup git to allow other users to access /workspace. Requires git 2.35.3 or
 # greater. See https://marc.info/?l=git&m=164989570902912&w=2. Only enable for
@@ -182,9 +304,9 @@ RUN git config --global --add safe.directory "*"
 # Configure and build cpython with debugging symbols
 FROM development as development_pydbg
 
-COPY ci/conda/recipes/python-dbg/ ./ci/conda/recipes/python-dbg
-COPY ci/conda/recipes/run_conda_build.sh ./ci/conda/recipes/run_conda_build.sh
-COPY ci/conda/recipes/python_dbg_install.sh ./ci/conda/recipes/python_dbg_install.sh
+COPY ${MORPHEUS_ROOT_HOST}/ci/conda/recipes/python-dbg/ ./ci/conda/recipes/python-dbg
+COPY ${MORPHEUS_ROOT_HOST}/ci/conda/recipes/run_conda_build.sh ./ci/conda/recipes/run_conda_build.sh
+COPY ${MORPHEUS_ROOT_HOST}/ci/conda/recipes/python_dbg_install.sh ./ci/conda/recipes/python_dbg_install.sh
 
 # Temporary until #68 goes in
 ARG MORPHEUS_USER="root"
@@ -193,7 +315,6 @@ ARG MORPHEUS_USER="root"
 RUN source activate morpheus \
     && MORPHEUS_ROOT=/workspace \
        CONDA_BLD_PATH=/opt/conda/conda-bld \
-       CONDA_ARGS="--no-test" \
        ./ci/conda/recipes/run_conda_build.sh pydebug \
     && ./ci/conda/recipes/python_dbg_install.sh \
        -s $( ls /opt/conda/conda-bld/src_cache/Python-${PYTHON_VER}*.tar.xz ) \