From 5373cad09aa6d8b2fd028be65cd33879fe5d45ff Mon Sep 17 00:00:00 2001 From: yf711 Date: Wed, 22 Jan 2025 20:28:35 -0800 Subject: [PATCH] sync to other dockerfiles --- .../docker/Dockerfile.ubuntu_cuda11_8_tensorrt8_6 | 14 +++++++++----- .../docker/Dockerfile.ubuntu_cuda11_tensorrt10 | 14 +++++++++----- .../docker/Dockerfile.ubuntu_cuda12_3_tensorrt8_6 | 14 +++++++++----- .../linux/docker/Dockerfile.ubuntu_tensorrt_bin | 14 +++++++++----- 4 files changed, 36 insertions(+), 20 deletions(-) diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_8_tensorrt8_6 b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_8_tensorrt8_6 index 3b4d36a9a8..60c1b995fe 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_8_tensorrt8_6 +++ b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_8_tensorrt8_6 @@ -14,19 +14,23 @@ ENV PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/src/tensorrt/bin:${ONNXR ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ - apt-get install -y sudo git bash unattended-upgrades wget -RUN unattended-upgrade + apt-get install -y sudo git bash unattended-upgrades wget software-properties-common &&\ + add-apt-repository -y ppa:deadsnakes/ppa &&\ + apt-get update # Install python3 RUN apt-get install -y --no-install-recommends \ - python3 \ + python3.10 \ + python3.10-dev \ + python3.10-venv \ + python3.10-distutils \ python3-pip \ - python3-dev \ python3-wheel &&\ cd /usr/local/bin &&\ - ln -s /usr/bin/python3 python &&\ + ln -sf /usr/bin/python3.10 python &&\ ln -s /usr/bin/pip3 pip; +RUN unattended-upgrade RUN pip install --upgrade pip RUN pip install setuptools>=68.2.2 diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_tensorrt10 b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_tensorrt10 index 01f08ff41e..a987b16a4f 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_tensorrt10 +++ b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_tensorrt10 @@ -14,19 +14,23 @@ ENV PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/src/tensorrt/bin:${ONNXR ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ - apt-get install -y sudo git bash unattended-upgrades wget -RUN unattended-upgrade + apt-get install -y sudo git bash unattended-upgrades wget software-properties-common &&\ + add-apt-repository -y ppa:deadsnakes/ppa &&\ + apt-get update # Install python3 RUN apt-get install -y --no-install-recommends \ - python3 \ + python3.10 \ + python3.10-dev \ + python3.10-venv \ + python3.10-distutils \ python3-pip \ - python3-dev \ python3-wheel &&\ cd /usr/local/bin &&\ - ln -s /usr/bin/python3 python &&\ + ln -sf /usr/bin/python3.10 python &&\ ln -s /usr/bin/pip3 pip; +RUN unattended-upgrade RUN pip install --upgrade pip RUN pip install psutil setuptools>=68.2.2 diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda12_3_tensorrt8_6 b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda12_3_tensorrt8_6 index 6d35df7289..066f159449 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda12_3_tensorrt8_6 +++ b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda12_3_tensorrt8_6 @@ -14,19 +14,23 @@ ENV PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/src/tensorrt/bin:${ONNXR ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ - apt-get install -y sudo git bash unattended-upgrades wget -RUN unattended-upgrade + apt-get install -y sudo git bash unattended-upgrades wget software-properties-common &&\ + add-apt-repository -y ppa:deadsnakes/ppa &&\ + apt-get update # Install python3 RUN apt-get install -y --no-install-recommends \ - python3 \ + python3.10 \ + python3.10-dev \ + python3.10-venv \ + python3.10-distutils \ python3-pip \ - python3-dev \ python3-wheel &&\ cd /usr/local/bin &&\ - ln -s /usr/bin/python3 python &&\ + ln -sf /usr/bin/python3.10 python &&\ ln -s /usr/bin/pip3 pip; +RUN unattended-upgrade RUN pip install --upgrade pip RUN pip install setuptools>=68.2.2 diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_tensorrt_bin b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_tensorrt_bin index 4f58dc8933..56577515be 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_tensorrt_bin +++ b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_tensorrt_bin @@ -14,19 +14,23 @@ ENV PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:${ONNXRUNTIME_LOCAL_CODE_DIR} ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ - apt-get install -y sudo git bash unattended-upgrades wget -RUN unattended-upgrade + apt-get install -y sudo git bash unattended-upgrades wget software-properties-common &&\ + add-apt-repository -y ppa:deadsnakes/ppa &&\ + apt-get update # Install python3 RUN apt-get install -y --no-install-recommends \ - python3 \ + python3.10 \ + python3.10-dev \ + python3.10-venv \ + python3.10-distutils \ python3-pip \ - python3-dev \ python3-wheel &&\ cd /usr/local/bin &&\ - ln -s /usr/bin/python3 python &&\ + ln -sf /usr/bin/python3.10 python &&\ ln -s /usr/bin/pip3 pip; +RUN unattended-upgrade RUN pip install --upgrade pip RUN pip install setuptools>=68.2.2