[None][chore]: reduce the layers of the devel docker image

Signed-off-by: Martin Marciniszyn Mehringer <11665257+MartinMarciniszyn@users.noreply.github.com>

Author: MartinMarciniszyn

docker/Dockerfile.multi

@@ -44,48 +44,41 @@ COPY docker/common/install.sh \
      docker/common/install_ucx.sh \
      docker/common/install_nixl.sh \
      docker/common/install_etcd.sh \
-     docker/common/install_mooncake.sh \
      ./
 
-RUN GITHUB_MIRROR=${GITHUB_MIRROR} \
-    PYTHON_VERSION=${PYTHON_VERSION} \
-    bash ./install.sh --base && rm install_base.sh
-
-RUN GITHUB_MIRROR=${GITHUB_MIRROR} bash ./install.sh --cmake && rm install_cmake.sh
-
-RUN GITHUB_MIRROR=${GITHUB_MIRROR} bash ./install.sh --ccache && rm install_ccache.sh
-
-RUN bash ./install.sh --cuda_toolkit && rm install_cuda_toolkit.sh
-
 ARG TRT_VER
 ARG CUDA_VER
 ARG CUDNN_VER
 ARG NCCL_VER
 ARG CUBLAS_VER
-RUN TRT_VER=${TRT_VER} \
+ARG TORCH_INSTALL_TYPE="skip"
+RUN GITHUB_MIRROR=${GITHUB_MIRROR} \
+    PYTHON_VERSION=${PYTHON_VERSION} \
+    TRT_VER=${TRT_VER} \
     CUDA_VER=${CUDA_VER} \
     CUDNN_VER=${CUDNN_VER} \
     NCCL_VER=${NCCL_VER} \
     CUBLAS_VER=${CUBLAS_VER} \
-    bash ./install.sh --tensorrt && rm install_tensorrt.sh
-
-RUN GITHUB_MIRROR=${GITHUB_MIRROR} bash ./install.sh --polygraphy && rm install_polygraphy.sh
-
-RUN GITHUB_MIRROR=${GITHUB_MIRROR} bash ./install.sh --mpi4py && rm install_mpi4py.sh
-
-ARG TORCH_INSTALL_TYPE="skip"
-RUN TORCH_INSTALL_TYPE=${TORCH_INSTALL_TYPE} bash ./install.sh --pytorch && rm install_pytorch.sh
-
-RUN bash ./install.sh --opencv && rm install.sh
-
-# Install UCX first
-RUN GITHUB_MIRROR=${GITHUB_MIRROR} bash ./install_ucx.sh && rm install_ucx.sh
-
-# Install NIXL
-RUN GITHUB_MIRROR=${GITHUB_MIRROR} bash ./install_nixl.sh && rm install_nixl.sh
-
-# Install etcd
-RUN bash ./install_etcd.sh && rm install_etcd.sh
+    TORCH_INSTALL_TYPE=${TORCH_INSTALL_TYPE} \
+    bash ./install.sh --base --cmake --ccache --cuda_toolkit --tensorrt --polygraphy --mpi4py --pytorch --opencv && \
+    rm install_base.sh && \
+    rm install_cmake.sh && \
+    rm install_ccache.sh && \
+    rm install_cuda_toolkit.sh && \
+    rm install_tensorrt.sh && \
+    rm install_polygraphy.sh && \
+    rm install_mpi4py.sh && \
+    rm install_pytorch.sh && \
+    rm install.sh
+
+# Install UCX, NIXL, etcd
+# TODO: Combine these into the main install.sh script
+RUN GITHUB_MIRROR=${GITHUB_MIRROR} bash ./install_ucx.sh && \
+    GITHUB_MIRROR=${GITHUB_MIRROR} bash ./install_nixl.sh && \
+    bash ./install_etcd.sh && \
+    rm install_ucx.sh && \
+    rm install_nixl.sh && \
+    rm install_etcd.sh
 
 FROM ${TRITON_IMAGE}:${TRITON_BASE_TAG} AS triton
 
@@ -100,16 +93,18 @@ COPY --from=triton /opt/tritonserver/caches /opt/tritonserver/caches
 
 # Copy all installation scripts at once to reduce layers
 COPY docker/common/install_triton.sh \
+     docker/common/install_mooncake.sh \
      ./
 
-RUN GITHUB_MIRROR=${GITHUB_MIRROR} bash ./install_triton.sh && rm install_triton.sh
-
 # Install Mooncake, after triton handles boost requirement
-RUN if [ -f /etc/redhat-release ]; then \
+RUN GITHUB_MIRROR=${GITHUB_MIRROR} bash ./install_triton.sh && \
+    if [ -f /etc/redhat-release ]; then \
         echo "Rocky8 detected, skipping mooncake installation"; \
     else \
         bash ./install_mooncake.sh; \
-    fi && rm install_mooncake.sh
+    fi && \
+    rm install_triton.sh && \
+    rm install_mooncake.sh
 
 FROM ${DEVEL_IMAGE} AS wheel
 WORKDIR /src/tensorrt_llm