From 1aaa906a78e7265669cd0b8f227885e010fd0173 Mon Sep 17 00:00:00 2001
From: Peter Feerick <peter.feerick@gmail.com>
Date: Sat, 12 Dec 2020 12:58:14 +1000
Subject: [PATCH] Expand update block for readability and add cleanup

---
 docker/amd64/Dockerfile   | 15 ++++++++++++++-
 docker/arm64v8/Dockerfile | 18 +++++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/docker/amd64/Dockerfile b/docker/amd64/Dockerfile
index 0ea2c0a9..c5bccb14 100644
--- a/docker/amd64/Dockerfile
+++ b/docker/amd64/Dockerfile
@@ -1,6 +1,19 @@
 FROM amd64/ubuntu:18.04
 
-RUN apt-get update -qq && apt-get install -y wget unzip cmake make build-essential git python3 python3-pip
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update -qq \
+    && apt-get install -y \ 
+        build-essential \
+        cmake \
+        git \
+        make \
+        python3 \
+        python3-pip \
+        tar \
+        unzip \
+        wget \
+    && rm -rf /var/cache/apt/* /var/lib/apt/lists/*
+
 RUN wget -q https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz -O - | tar -xj -C /opt/
 RUN wget -q https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip && unzip -q nRF5_SDK_15.3.0_59ac345.zip -d /opt/ && rm nRF5_SDK_15.3.0_59ac345.zip
 
diff --git a/docker/arm64v8/Dockerfile b/docker/arm64v8/Dockerfile
index 8b9e4514..9de2b908 100644
--- a/docker/arm64v8/Dockerfile
+++ b/docker/arm64v8/Dockerfile
@@ -1,6 +1,22 @@
 FROM arm64v8/ubuntu:18.04
 
-RUN apt-get update -qq && apt-get install -y wget unzip cmake make build-essential git python3 python3-pip libffi-dev libssl-dev python3-dev
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update -qq \
+    && apt-get install -y \ 
+        build-essential \
+        cmake \
+        git \
+        libffi-dev \
+        libssl-dev \
+        make \
+        python3 \
+        python3-dev \
+        python3-pip \
+        tar \
+        unzip \
+        wget \
+    && rm -rf /var/cache/apt/* /var/lib/apt/lists/*
+
 RUN wget -q https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-aarch64-linux.tar.bz2 -O - | tar -xj -C /opt/
 RUN wget -q https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip && unzip -q nRF5_SDK_15.3.0_59ac345.zip -d /opt/ && rm nRF5_SDK_15.3.0_59ac345.zip