copy linux libraries out

Dockerfile

@@ -18,8 +18,7 @@
 # These ARGs must be before the first FROM. This allows them to be valid for
 # use in FROM instructions.
 ARG MPI_OPERATOR_VERSION=0.6.0
-# See https://www.open-mpi.org/software/ompi/v4.1/ for releases and their
-# checkums.
+# See https://www.open-mpi.org/software/ompi/v4.1/ for releases and their checksums.
 ARG OPENMPI_VERSION=4.1.7
 ARG OPENMPI_MD5=787d2bc8b3db336db97c34236934b3df
 
@@ -42,6 +41,19 @@ RUN apt-get update && apt-get install -y \
     && rm -rf /var/lib/apt/lists/* \
     && update-ca-certificates
 
+RUN mkdir -p /deps /mfu
+WORKDIR /deps
+
+# Build lustre to include in mpifileutils
+RUN git clone https://github.com/Cray/lustre.git \
+    && cd lustre \
+    && git checkout cray-2.15.B19 \
+    && sh autogen.sh \
+    && ./configure --disable-server --enable-client --disable-tests --enable-mpitests=no --disable-gss-keyring --enable-gss=no -with-linux=/usr/src/linux-headers-6.1.0-30-amd64 --prefix=/deps/lustre/lib \
+    && make \
+    && make install
+#   && make debs -j $(nproc)
+
 # Remove the OS binary of openmpi and build from source
 RUN apt-get remove -y openmpi-bin
 RUN wget --no-check-certificate https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-$OPENMPI_VERSION.tar.gz
@@ -53,9 +65,6 @@ RUN gunzip -c openmpi-$OPENMPI_VERSION.tar.gz | tar xf - \
 RUN cp -r /opt/openmpi-$OPENMPI_VERSION/* /usr
 
 # Build and install MPI File Utils and all dependencies
-RUN mkdir -p /deps /mfu
-WORKDIR /deps
-
 RUN wget https://github.com/hpc/libcircle/releases/download/v0.3/libcircle-0.3.0.tar.gz \
     && tar xfz libcircle-0.3.0.tar.gz \
     && cd libcircle-0.3.0 \
@@ -80,33 +89,6 @@ RUN wget https://github.com/llnl/dtcmp/releases/download/v1.1.1/dtcmp-1.1.1.tar.
     && ./configure --prefix=/deps/dtcmp/lib --with-lwgrp=/deps/lwgrp/lib \
     && make install
 
-#RUN wget https://downloads.whamcloud.com/public/lustre/latest-release/ubuntu2204/client/lustre-client-modules-5.15.0-88-generic_2.15.6-1_amd64.deb \
-#    && dpkg -i lustre-client-modules-5.15.0-88-generic_2.15.6-1_amd64.deb
-
-#RUN git clone git://git.whamcloud.com/fs/lustre-release.git \
-#    && cd lustre-release \
-#    && git checkout 2.15.6 \
-#    && sh autogen.sh \
-#    && ./configure --disable-server --with-linux=/usr/src/linux-headers-6.1.0-30-common \
-#    && make debs -j $(nproc)
-
-#RUN wget https://github.com/LLNL/lustre/archive/refs/tags/2.15.6_4.llnl.tar.gz \
-#    && tar xfz 2.15.6_4.llnl.tar.gz \
-#    && cd lustre-2.15.6_4.llnl \
-#    && sh autogen.sh \
-#    # && ./configure --disable-modules --disable-libcfs-cdebug --disable-libcfs-trace --disable-libcfs-assert \
-##    && ./configure --disable-modules --disable-server \
-#    && ./configure --disable-server --enable-client --disable-tests --enable-mpitests=no --disable-gss-keyring --enable-gss=no -with-linux=/usr/src/linux-headers-6.1.0-30-amd64
-#    && make \
-#    && make install
-
-RUN git clone https://github.com/Cray/lustre.git \
-    && cd lustre \
-    && sh autogen.sh \
-    && ./configure --disable-server --enable-client --disable-tests --enable-mpitests=no --disable-gss-keyring --enable-gss=no -with-linux=/usr/src/linux-headers-6.1.0-30-amd64 \
-    && make \
-    && make install
-
 # Until a new release of mpifileutils is cut, we need to use a tagged commit on
 # our fork to include our dcp changes (i.e. --uid, --gid)
 RUN git clone --depth 1 https://github.com/nearnodeflash/mpifileutils.git --branch nnf-stable-v3 \
@@ -156,6 +138,7 @@ ENV OPENMPI_VERSION=$OPENMPI_VERSION
 # Provides nslookup for NNF Containers. Used for MPI Launcher InitContainers.
 RUN apt-get update && apt-get install -y dnsutils && rm -rf /var/lib/apt/lists/*
 
+COPY --from=builder /deps/lustre/lib/ /usr
 COPY --from=builder /deps/libcircle/lib/ /usr
 COPY --from=builder /deps/libarchive/lib/ /usr
 COPY --from=builder /deps/lwgrp/lib/ /usr