From 21fb160610b1b4d6d823f1df62878057a3c34407 Mon Sep 17 00:00:00 2001 From: Abolfazl Shahbazi Date: Mon, 19 Aug 2019 11:22:51 -0700 Subject: [PATCH 1/2] Remove proxy info from Dockerfile.ubuntu18.04 --- tools/Dockerfile.ubuntu18.04 | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/tools/Dockerfile.ubuntu18.04 b/tools/Dockerfile.ubuntu18.04 index aacbfd52b..b2046688e 100644 --- a/tools/Dockerfile.ubuntu18.04 +++ b/tools/Dockerfile.ubuntu18.04 @@ -18,21 +18,17 @@ FROM ubuntu:18.04 -# Setup the environment -ENV https_proxy http://proxy-chain.intel.com:912 -ENV http_proxy http://proxy-chain.intel.com:911 - RUN apt-get update && apt-get install -y \ - vim \ + build-essential cmake \ + clang-format-3.9 \ + git \ python \ python-pip \ python3-pip \ - git \ - unzip zip wget \ sudo \ - zlib1g zlib1g-dev bash-completion \ - build-essential cmake \ - clang-format-3.9 + unzip zip wget \ + vim \ + zlib1g zlib1g-dev bash-completion RUN pip install -U virtualenv==16.0.0 @@ -43,7 +39,7 @@ RUN sh /cmake-3.7.2-Linux-x86_64.sh --prefix=/opt/cmake --skip-license RUN ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake RUN cmake --version -#Install Bazel +#Install Bazel ADD https://github.com/bazelbuild/bazel/releases/download/0.24.1/bazel-0.24.1-installer-linux-x86_64.sh ./bazel-0.24.1-installer-linux-x86_64.sh RUN bash bazel-0.24.1-installer-linux-x86_64.sh RUN bazel From dda2206f69d354c4e4bf0f01291e3b6a21547b19 Mon Sep 17 00:00:00 2001 From: Abolfazl Shahbazi Date: Mon, 19 Aug 2019 11:43:28 -0700 Subject: [PATCH 2/2] Organize apt-get installed packages --- tools/Dockerfile.ubuntu18.04 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/Dockerfile.ubuntu18.04 b/tools/Dockerfile.ubuntu18.04 index b2046688e..232ab3447 100644 --- a/tools/Dockerfile.ubuntu18.04 +++ b/tools/Dockerfile.ubuntu18.04 @@ -19,6 +19,7 @@ FROM ubuntu:18.04 RUN apt-get update && apt-get install -y \ + bash-completion \ build-essential cmake \ clang-format-3.9 \ git \ @@ -28,7 +29,7 @@ RUN apt-get update && apt-get install -y \ sudo \ unzip zip wget \ vim \ - zlib1g zlib1g-dev bash-completion + zlib1g zlib1g-dev RUN pip install -U virtualenv==16.0.0