From 65b2b87f838c35f23cdd902e43b1a2aa0e62d698 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Wed, 21 Apr 2021 13:18:34 -0700 Subject: [PATCH] Update CI build docker images (#7386) Update CI build docker images: delete ubuntu 16.04 support. --- ...ortmodule-distributed-test-ci-pipeline.yml | 2 +- ...g-linux-gpu-ortmodule-test-ci-pipeline.yml | 2 +- .../github/linux/docker/Dockerfile.ubuntu | 4 +- .../docker/Dockerfile.ubuntu_for_android | 2 - .../github/linux/docker/Dockerfile.ubuntu_gpu | 2 +- .../linux/docker/Dockerfile.ubuntu_tensorrt | 2 - .../linux/docker/scripts/install_ubuntu.sh | 52 +------------------ 7 files changed, 6 insertions(+), 60 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/orttraining-linux-gpu-ortmodule-distributed-test-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/orttraining-linux-gpu-ortmodule-distributed-test-ci-pipeline.yml index a920e0feb5..b4c063ef38 100644 --- a/tools/ci_build/github/azure-pipelines/orttraining-linux-gpu-ortmodule-distributed-test-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/orttraining-linux-gpu-ortmodule-distributed-test-ci-pipeline.yml @@ -14,7 +14,7 @@ jobs: - template: templates/run-docker-build-steps.yml parameters: RunDockerBuildArgs: | - -o ubuntu16.04 -d gpu -r $(Build.BinariesDirectory) \ + -o ubuntu18.04 -d gpu -r $(Build.BinariesDirectory) \ -t onnxruntime_ortmodule_distributed_tests_image \ -x " \ --config RelWithDebInfo \ diff --git a/tools/ci_build/github/azure-pipelines/orttraining-linux-gpu-ortmodule-test-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/orttraining-linux-gpu-ortmodule-test-ci-pipeline.yml index 5dc7c3923f..95162e57cc 100644 --- a/tools/ci_build/github/azure-pipelines/orttraining-linux-gpu-ortmodule-test-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/orttraining-linux-gpu-ortmodule-test-ci-pipeline.yml @@ -14,7 +14,7 @@ jobs: - template: templates/run-docker-build-steps.yml parameters: RunDockerBuildArgs: | - -o ubuntu16.04 -d gpu -r $(Build.BinariesDirectory) \ + -o ubuntu18.04 -d gpu -r $(Build.BinariesDirectory) \ -t onnxruntime_ortmodule_tests_image \ -x " \ --config RelWithDebInfo \ diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu index da8d9ddfb3..5f8cff18e3 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu +++ b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu @@ -1,4 +1,4 @@ -ARG OS_VERSION=16.04 +ARG OS_VERSION=18.04 FROM ubuntu:${OS_VERSION} ARG PYTHON_VERSION=3.6 @@ -8,8 +8,6 @@ RUN /tmp/scripts/install_ubuntu.sh -p $PYTHON_VERSION && /tmp/scripts/install_de WORKDIR /root -ENV LD_LIBRARY_PATH /usr/local/openblas/lib:$LD_LIBRARY_PATH - ARG BUILD_UID=1000 ARG BUILD_USER=onnxruntimedev RUN adduser --gecos 'onnxruntime Build User' --disabled-password $BUILD_USER --uid $BUILD_UID diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_for_android b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_for_android index ea6458d627..56c5ea97b1 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_for_android +++ b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_for_android @@ -7,8 +7,6 @@ RUN /tmp/scripts/install_ubuntu.sh -p $PYTHON_VERSION && /tmp/scripts/install_de WORKDIR /root -ENV LD_LIBRARY_PATH /usr/local/openblas/lib:$LD_LIBRARY_PATH - ARG BUILD_UID=1000 ARG BUILD_USER=onnxruntimedev RUN adduser --gecos 'onnxruntime Build User' --disabled-password $BUILD_USER --uid $BUILD_UID diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_gpu b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_gpu index c6a5972afe..94c2e9f099 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_gpu +++ b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_gpu @@ -1,4 +1,4 @@ -FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu16.04 +FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu18.04 ARG PYTHON_VERSION=3.6 ARG INSTALL_DEPS_EXTRA_ARGS diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_tensorrt b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_tensorrt index 477ff4cbc6..077e228a06 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_tensorrt +++ b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_tensorrt @@ -22,8 +22,6 @@ RUN _CUDNN_VERSION=$(echo $CUDNN_VERSION | cut -d. -f1-2) && \ ln -s /etc/alternatives/libcudnn_so /usr/local/cudnn-$_CUDNN_VERSION/cuda/lib64/libcudnn.so && \ ln -s /usr/local/cudnn{-$_CUDNN_VERSION,} -ENV LD_LIBRARY_PATH /usr/local/openblas/lib:$LD_LIBRARY_PATH - ARG BUILD_USER=onnxruntimedev ARG BUILD_UID=1000 WORKDIR /home/$BUILD_USER diff --git a/tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh b/tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh index 023855e1b5..bbd843346a 100755 --- a/tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh +++ b/tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh @@ -22,7 +22,7 @@ SYS_LONG_BIT=$(getconf LONG_BIT) #see: https://docs.microsoft.com/en-us/dotnet/core/linux-prerequisites?tabs=netcore21 -if [ "$OS_VERSION" = "16.04" ]; then +if [ "$OS_VERSION" = "18.04" ]; then PACKAGE_LIST="autotools-dev \ automake \ build-essential \ @@ -39,40 +39,6 @@ if [ "$OS_VERSION" = "16.04" ]; then gfortran \ python3-dev \ language-pack-en \ - libopenblas-dev \ - liblttng-ust0 \ - libcurl3 \ - libssl1.0.0 \ - libkrb5-3 \ - libicu55 \ - libtinfo-dev \ - libtool \ - openssh-server \ - aria2 \ - bzip2 \ - unzip \ - zip \ - rsync libunwind8 libpng16-dev libexpat1-dev \ - python3-setuptools python3-numpy python3-wheel python python3-pip python3-pytest \ - openjdk-8-jdk" -elif [ "$OS_VERSION" = "18.04" ]; then - PACKAGE_LIST="autotools-dev \ - automake \ - build-essential \ - git apt-transport-https apt-utils \ - ca-certificates \ - pkg-config \ - wget \ - zlib1g \ - zlib1g-dev \ - libssl-dev \ - curl libcurl4-openssl-dev \ - autoconf \ - sudo \ - gfortran \ - python3-dev \ - language-pack-en \ - libopenblas-dev \ liblttng-ust0 \ libcurl4 \ libssl1.0.0 \ @@ -105,7 +71,6 @@ else # ubuntu20.04 gfortran \ python3-dev \ language-pack-en \ - libopenblas-dev \ liblttng-ust0 \ libcurl4 \ libssl1.1 \ @@ -141,20 +106,7 @@ if [ "$SYS_LONG_BIT" = "64" ]; then fi if [ "$OS_VERSION" = "16.04" ]; then - if [ "$PYTHON_VER" != "3.5" ]; then - add-apt-repository -y ppa:deadsnakes/ppa - apt-get update - apt-get install -y --no-install-recommends \ - python${PYTHON_VER} \ - python${PYTHON_VER}-dev - update-alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VER} 1 - update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.5 2 - update-alternatives --set python3 /usr/bin/python${PYTHON_VER} - #TODO: the old one(/usr/bin/pip3) should be uninstalled first. Because the one will be - #put at /usr/local/. Then there will be two pips. - /usr/bin/python${PYTHON_VER} -m pip install --upgrade --force-reinstall pip==19.0.3 - fi - + exit 1 elif [ "$OS_VERSION" = "18.04" ]; then if [ "$PYTHON_VER" != "3.6" ]; then add-apt-repository -y ppa:deadsnakes/ppa