From 4e213bbea763b9b49feeb31915c7d2aa2e482089 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Sun, 21 Oct 2018 22:43:35 +0200
Subject: [PATCH 1/2] remove trailing space

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index eeec4c03..e0392a37 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -145,7 +145,7 @@ RUN gcc -DHOMEDIR=\"/data/riotbuild\" -DUSERNAME=\"riotbuild\" /tmp/create_user.
     && chmod u=rws,g=x,o=- /usr/local/bin/create_user \
     && rm /tmp/create_user.c
 
-# Install complete ESP8266 toolchain in /opt/esp (146 MB after cleanup) 
+# Install complete ESP8266 toolchain in /opt/esp (146 MB after cleanup)
 RUN echo 'Installing ESP8266 toolchain' >&2 && \
     cd /opt && \
     git clone https://github.com/gschorcht/RIOT-Xtensa-ESP8266-toolchain.git esp && \

From 9d44f26e0730d9f7da80d20c0356488850d7dd1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Sun, 21 Oct 2018 22:44:03 +0200
Subject: [PATCH 2/2] apt: Use --no-install-recommends to avoid unnecessary
 extras

---
 Dockerfile | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e0392a37..4d4532e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,10 +36,11 @@ RUN \
     echo 'Upgrading all system packages to the latest available versions' >&2 && \
     apt-get update && apt-get -y dist-upgrade \
     && echo 'Installing native toolchain and build system functionality' >&2 && \
-    apt-get -y install \
+    apt-get -y --no-install-recommends install \
         automake \
         bsdmainutils \
         build-essential \
+        ca-certificates \
         ccache \
         coccinelle \
         curl \
@@ -50,6 +51,7 @@ RUN \
         g++-multilib \
         git \
         graphviz \
+        less \
         libpcre3 \
         libtool \
         m4 \
@@ -64,25 +66,28 @@ RUN \
         python3-flake8 \
         python-serial \
         p7zip \
+        rsync \
+        ssh-client \
         subversion \
         unzip \
         vim-common \
         wget \
         xsltproc \
     && echo 'Installing MSP430 toolchain' >&2 && \
-    apt-get -y install \
+    apt-get -y --no-install-recommends install \
         gcc-msp430 \
+        msp430-libc \
     && echo 'Installing AVR toolchain' >&2 && \
-    apt-get -y install \
+    apt-get -y --no-install-recommends install \
         gcc-avr \
         binutils-avr \
         avr-libc \
     && echo 'Installing LLVM/Clang toolchain' >&2 && \
-    apt-get -y install \
+    apt-get -y --no-install-recommends install \
         llvm \
         clang \
     && echo 'Installing socketCAN' >&2 && \
-    apt-get -y install \
+    apt-get -y --no-install-recommends install \
         libsocketcan-dev:i386 \
         libsocketcan2:i386 \
     && echo 'Cleaning up installation files' >&2 && \