[CI] Update CICD for dev_container

Author: fuhailin

tools/build_base_container.sh

@@ -10,9 +10,9 @@ OS_VERSION=${4:-"20.04"}
 docker build \
     -f tools/docker/base_container.Dockerfile \
     --network=host \
-    --progress=plain \
     --build-arg http_proxy=http://127.0.0.1:7890 \
     --build-arg https_proxy=http://127.0.0.1:7890 \
+    --progress=plain \
     --build-arg CUDA_VERSION=${CUDA_VERSION} \
     --build-arg TF_VERSION=${TF_VERSION} \
     --build-arg PY_VERSION=${PY_VERSION} \

tools/build_dev_container.sh

@@ -4,11 +4,14 @@ set -x -e
 
 PY_VERSION=${1:-"3.10"}
 TF_VERSION=${2:-"2.15.1"}
-OS_VERSION=${3:-"20.04"}
-CUDA_VERSION=${4:-"12.2.2"}
+CUDA_VERSION=${3:-"12.2.2"}
+OS_VERSION=${4:-"20.04"}
 
 docker build \
     -f tools/docker/dev_container.Dockerfile \
+    --network=host \
+    --build-arg http_proxy=http://127.0.0.1:7890 \
+    --build-arg https_proxy=http://127.0.0.1:7890 \
     --progress=plain \
     --build-arg TF_PACKAGE=tensorflow \
     --build-arg PY_VERSION=${PY_VERSION} \

tools/docker/dev_container.Dockerfile

@@ -58,6 +58,8 @@ ARG PY_VERSION
 
 # Setup openmpi
 COPY --from=openmpi_builder /opt/openmpi /opt/openmpi
+COPY --from=openmpi_builder /opt/ucx /opt/ucx
+COPY --from=openmpi_builder /opt/ucc /opt/ucc
 ENV PATH=${PATH}:/opt/openmpi/bin \
     LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/openmpi/lib
 RUN mpirun --version

tools/install_deps/install_cmake.sh

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-set -x -e
+set -xeuo pipefail
 
 CMAKE_VERSION=${1:-"3.31.0"}
 
@@ -27,12 +27,12 @@ rm /tmp/cmake-install.sh
 cat >bashrc.txt <<'EOF'
 export CMAKE_HOME=/opt/cmake
 export PATH="${CMAKE_HOME}/bin:${PATH}"
-export LD_LIBRARY_PATH="${CMAKE_HOME}/lib:${LD_LIBRARY_PATH}"
+export LD_LIBRARY_PATH="${CMAKE_HOME}/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
 EOF
 cat bashrc.txt >>/root/.bashrc
 
 export CMAKE_HOME=/opt/cmake
 export PATH="${CMAKE_HOME}/bin:${PATH}"
-export LD_LIBRARY_PATH="${CMAKE_HOME}/lib:${LD_LIBRARY_PATH}"
+export LD_LIBRARY_PATH="${CMAKE_HOME}/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
 
 cmake --version