[libcxx-commits] [libcxx] 738d981 - [libc++] Update the CI Dockerfile

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-11-05T15:33:09-05:00
New Revision: 738d981eb6b4417bbe4ebab9e3ee43c7699771c3

URL: https://github.com/llvm/llvm-project/commit/738d981eb6b4417bbe4ebab9e3ee43c7699771c3
DIFF: https://github.com/llvm/llvm-project/commit/738d981eb6b4417bbe4ebab9e3ee43c7699771c3.diff

LOG: [libc++] Update the CI Dockerfile

Remove Phabricator, which isn't needed anymore since we don't report
the job results ourselves. Also, install python3-sphinx instead of
sphinx-doc, since the latter doesn't provide the sphinx-build binary.

Added: 
    

Modified: 
    libcxx/utils/ci/Dockerfile

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile
index f0de9f64ba91..908557308647 100644
--- a/libcxx/utils/ci/Dockerfile
+++ b/libcxx/utils/ci/Dockerfile
@@ -39,20 +39,16 @@
 
 FROM ubuntu:bionic
 
-RUN apt-get update
-RUN apt-get install -y bash curl
+# Make sure apt-get doesn't try to prompt for stuff like our time zone, etc.
+ENV DEBIAN_FRONTEND=noninteractive
 
-# Install various tools used by the build or the test suite
-RUN apt-get install -y ninja-build python3 sphinx-doc git
+RUN apt-get update && apt-get install -y bash curl
 
-# Install the Phabricator Python module to allow uploading results to Phabricator.
-# This MUST be done before installing a recent GCC, otherwise /usr/bin/gcc is
-# overwritten to an older GCC.
-RUN apt-get install -y python3-pip
-RUN pip3 install phabricator
+# Install various tools used by the build or the test suite
+RUN apt-get update && apt-get install -y ninja-build python3 python3-sphinx git
 
 # Install the most recently released LLVM
-RUN apt-get install -y lsb-release wget software-properties-common
+RUN apt-get update && apt-get install -y lsb-release wget software-properties-common
 RUN bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
 RUN ln -s $(find /usr/bin -regex '.+/clang\+\+-[a-zA-Z0-9.]+') /usr/bin/clang++
 RUN ln -s $(find /usr/bin -regex '.+/clang-[a-zA-Z0-9.]+') /usr/bin/clang
@@ -70,7 +66,7 @@ RUN rm /tmp/install-cmake.sh
 
 # Change the user to a non-root user, since some of the libc++ tests
 # (e.g. filesystem) require running as non-root. Also setup passwordless sudo.
-RUN apt-get install -y sudo
+RUN apt-get update && apt-get install -y sudo
 RUN echo "ALL ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers
 RUN useradd --create-home libcxx-builder
 USER libcxx-builder