From 3bcb3884d9a31259e5eb19de8486220b6535c71e Mon Sep 17 00:00:00 2001
From: Serge Panev <spanev@nvidia.com>
Date: Mon, 3 Aug 2020 13:14:33 -0700
Subject: [PATCH] Revert useless changes

Signed-off-by: Serge Panev <spanev@nvidia.com>
---
 ci/docker/Dockerfile.build.ubuntu | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/ci/docker/Dockerfile.build.ubuntu b/ci/docker/Dockerfile.build.ubuntu
index 3babb468f2fe..4ac3f9149ea7 100644
--- a/ci/docker/Dockerfile.build.ubuntu
+++ b/ci/docker/Dockerfile.build.ubuntu
@@ -50,6 +50,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
         build-essential \
         ninja-build \
         git \
+        protobuf-compiler \
+        libprotobuf-dev \
         clang-6.0 \
         clang-tidy-6.0 \
         python-yaml \
@@ -81,8 +83,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
         pandoc \
         ## Build-dependencies for ccache 3.7.9
         autoconf \
-        autogen \
-        libtool \
         gperf \
         libb2-dev \
         libzstd-dev && \
@@ -110,15 +110,6 @@ COPY install/requirements /work/
 RUN python3 -m pip install cmake==3.16.6 && \
     python3 -m pip install -r /work/requirements
 
-RUN git clone --recursive -b 3.5.1.1 https://github.com/google/protobuf.git && \
-    cd protobuf && \
-    ./autogen.sh && \
-    ./configure && \
-    make -j$(nproc) install && \
-    cd .. && \
-    rm -rf protobuf && \
-    ldconfig
-
 ARG USER_ID=0
 COPY install/docker_filepermissions.sh /work/
 RUN /work/docker_filepermissions.sh
@@ -146,8 +137,6 @@ RUN cd /usr/local && \
 # https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
 ARG BASE_IMAGE
 RUN export SHORT_CUDA_VERSION=${CUDA_VERSION%.*} && \
-    wget -O nvidia-ml.deb https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64/nvidia-machine-learning-repo-ubuntu1804_1.0.0-1_amd64.deb && \
-    dpkg -i nvidia-ml.deb && \
     apt-get update && \
     if [ ${SHORT_CUDA_VERSION} = 10.0 ]; then \
         TRT_VERSION="7.0.0-1+cuda10.0"; \
@@ -166,7 +155,6 @@ RUN export SHORT_CUDA_VERSION=${CUDA_VERSION%.*} && \
                        libnvinfer-dev=${TRT_VERSION} \
                        libnvinfer-plugin${TRT_MAJOR_VERSION}=${TRT_VERSION} \
                        libnvinfer-plugin-dev=${TRT_VERSION} && \
-    rm nvidia-ml.deb && \
     rm -rf /var/lib/apt/lists/*
 
 FROM gpu as gpuwithcudaruntimelibs