Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Commit

Permalink
Revert useless changes
Browse files Browse the repository at this point in the history
Signed-off-by: Serge Panev <[email protected]>
  • Loading branch information
Kh4L committed Aug 3, 2020
1 parent 8ac1b95 commit 3bcb388
Showing 1 changed file with 2 additions and 14 deletions.
16 changes: 2 additions & 14 deletions ci/docker/Dockerfile.build.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 && \
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"; \
Expand All @@ -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
Expand Down

0 comments on commit 3bcb388

Please sign in to comment.