Aligned with Ubuntu

Author: schafdog

swift-ci/master/debian/10/Dockerfile

@@ -5,9 +5,7 @@ RUN groupadd -g 998 build-user && \
 
 ENV DEBIAN_FRONTEND="noninteractive"
 
-RUN apt-get update
-
-RUN apt-get -y --no-install-recommends install \
+RUN apt-get -y update && apt-get -y --no-install-recommends install \
   build-essential       \
   clang                 \
   cmake                 \
@@ -17,22 +15,24 @@ RUN apt-get -y --no-install-recommends install \
   libedit-dev           \
   libicu-dev            \
   libncurses5-dev       \
+  libpython3-dev        \
   libsqlite3-dev        \
   libxml2-dev           \
   ninja-build           \
+  pkg-config            \
   python                \
-  python-dev            \
   python-six            \
-  pkg-config            \
+  python2-dev           \
+  python3-six           \
+  python3-distutils     \
   rsync                 \
   swig                  \
   systemtap-sdt-dev     \
   tzdata                \
   unzip                 \
-  vim                   \
   uuid-dev		\
   ca-certificates
 
 USER build-user
 
-WORKDIR /home/build-user
+WORKDIR /home/build-user