From a59638768919efd7dcd22ee8c6d48c4b776f3f24 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Sun, 23 Feb 2020 01:01:29 +0100
Subject: [PATCH] Dockerfile: sort dependencies, and cleanup apt cache

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 Dockerfile | 57 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index caf6f1e3..2c8fa7f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,31 +9,38 @@ RUN dpkg --add-architecture armel \
     && dpkg --add-architecture armhf \
     && dpkg --add-architecture arm64 \
     && dpkg --add-architecture ppc64el \
-    && apt-get update && apt-get install -y \
-    build-essential \
-    curl \
-    sudo \
-    gawk \
-    iptables \
-    jq \
-    pkg-config \
-    libaio-dev \
-    libcap-dev \
-    libprotobuf-dev \
-    libprotobuf-c0-dev \
-    libnl-3-dev \
-    libnet-dev \
-    libseccomp2 \
-    libseccomp-dev \
-    protobuf-c-compiler \
-    protobuf-compiler \
-    python-minimal \
-    uidmap \
-    kmod \
-    crossbuild-essential-armel crossbuild-essential-armhf crossbuild-essential-arm64 crossbuild-essential-ppc64el \
-    libseccomp-dev:armel libseccomp-dev:armhf libseccomp-dev:arm64 libseccomp-dev:ppc64el \
-    --no-install-recommends \
-    && apt-get clean
+    && apt-get update \
+    && apt-get install -y --no-install-recommends \
+        build-essential \
+        crossbuild-essential-arm64 \
+        crossbuild-essential-armel \
+        crossbuild-essential-armhf \
+        crossbuild-essential-ppc64el \
+        curl \
+        gawk \
+        iptables \
+        jq \
+        kmod \
+        libaio-dev \
+        libcap-dev \
+        libnet-dev \
+        libnl-3-dev \
+        libprotobuf-c0-dev \
+        libprotobuf-dev \
+        libseccomp-dev \
+        libseccomp-dev:arm64 \
+        libseccomp-dev:armel \
+        libseccomp-dev:armhf \
+        libseccomp-dev:ppc64el \
+        libseccomp2 \
+        pkg-config \
+        protobuf-c-compiler \
+        protobuf-compiler \
+        python-minimal \
+        sudo \
+        uidmap \
+    && apt-get clean \
+    && rm -rf /var/cache/apt /var/lib/apt/lists/*;
 
 # Add a dummy user for the rootless integration tests. While runC does
 # not require an entry in /etc/passwd to operate, one of the tests uses