Index: ps/trunk/build/jenkins/dockerfiles/build-base.Dockerfile
===================================================================
--- ps/trunk/build/jenkins/dockerfiles/build-base.Dockerfile	(revision 27096)
+++ ps/trunk/build/jenkins/dockerfiles/build-base.Dockerfile	(revision 27097)
@@ -1,54 +1,45 @@
 FROM debian:buster
 
 RUN useradd -ms /bin/bash --uid 1006 builder
 
-RUN apt-get -qq update
-
 # 0 A.D. dependencies.
-RUN apt-get install -qqy \
-      build-essential \
+RUN apt-get -qq update && apt-get install -qqy \
       cmake \
       curl \
       libboost-dev \
       libboost-filesystem-dev \
       libclang-7-dev \
       libcurl4-gnutls-dev \
       libenet-dev \
       libfmt-dev \
+      libfreetype6-dev \
       libgloox-dev \
       libgnutls28-dev \
       libgtk-3-dev \
       libicu-dev \
       libidn11-dev \
       libjson-perl \
       libminiupnpc-dev \
       libogg-dev \
       libopenal-dev \
       libpng-dev \
-      libsodium-dev \
       libsdl2-dev \
+      libsodium-dev \
       libvorbis-dev \
       libwxgtk3.0-dev \
       libxcursor-dev \
-      libxml2-dev \
       libxml-simple-perl \
+      libxml2-dev \
       llvm-7 \
-      zlib1g-dev \
- && apt-get clean
-
-# Other utilities
-RUN apt-get install -qqy \
       python3-dev \
       python3-pip \
-      rsync \
-      subversion \
-      vim \
-      mkdocs
+      zlib1g-dev \
+ && apt-get clean
 
 # Install rust and Cargo via rustup
 USER builder
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 ENV PATH="${PATH}:/home/builder/.cargo/bin"
 USER root
 
 ENV SHELL /bin/bash
Index: ps/trunk/build/jenkins/dockerfiles/clang7.Dockerfile
===================================================================
--- ps/trunk/build/jenkins/dockerfiles/clang7.Dockerfile	(nonexistent)
+++ ps/trunk/build/jenkins/dockerfiles/clang7.Dockerfile	(revision 27097)
@@ -0,0 +1,9 @@
+FROM build-base:latest
+
+RUN apt-get install -qqy clang-7 lld-7
+
+USER builder
+
+ENV CC clang-7
+ENV CXX clang++-7
+ENV LDFLAGS -fuse-ld=lld-7
\ No newline at end of file

Property changes on: ps/trunk/build/jenkins/dockerfiles/clang7.Dockerfile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/build/jenkins/dockerfiles/gcc7.Dockerfile
===================================================================
--- ps/trunk/build/jenkins/dockerfiles/gcc7.Dockerfile	(revision 27096)
+++ ps/trunk/build/jenkins/dockerfiles/gcc7.Dockerfile	(revision 27097)
@@ -1,10 +1,10 @@
 FROM build-base:latest
 
 RUN apt-get install -qqy gcc-7 g++-7
 
 USER builder
 
 ENV LIBCC gcc-7
 ENV LIBCXX g++-7
-ENV PSCC gcc-7
-ENV PSCXX g++-7
+ENV CC gcc-7
+ENV CXX g++-7
\ No newline at end of file