From f8e49ea3f42e50fbdcc764e99d833bc78291d72f Mon Sep 17 00:00:00 2001
From: Robin Schneider <ypid@riseup.net>
Date: Tue, 31 Dec 2019 16:40:15 +0100
Subject: [PATCH] Use apt-get instead of apt in Dockerfiles, also
 --no-install-recommends

apt is intended for humans, not scripts.

--no-install-recommends improves build time by avoiding to install
unneeded packages.
---
 docker/Dockerfile.j2               | 5 +++--
 docker/aarch64/mysql/Dockerfile    | 5 +++--
 docker/aarch64/sqlite/Dockerfile   | 5 +++--
 docker/amd64/mysql/Dockerfile      | 5 +++--
 docker/amd64/postgresql/Dockerfile | 5 +++--
 docker/amd64/sqlite/Dockerfile     | 5 +++--
 docker/armv6/mysql/Dockerfile      | 5 +++--
 docker/armv6/sqlite/Dockerfile     | 5 +++--
 docker/armv7/mysql/Dockerfile      | 5 +++--
 docker/armv7/sqlite/Dockerfile     | 5 +++--
 10 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2
index 54c3e8b8..5fde7dcd 100644
--- a/docker/Dockerfile.j2
+++ b/docker/Dockerfile.j2
@@ -45,8 +45,9 @@ ARG TERM=xterm-256color
 
 RUN echo $TERM
 
-RUN apt update -y \
-    && apt install -y \
+RUN apt-get update \
+    && apt-get install -y \
+        --no-install-recommends \
         curl \
         tar
 {% endif %}
diff --git a/docker/aarch64/mysql/Dockerfile b/docker/aarch64/mysql/Dockerfile
index c1bf4ad2..cea326db 100644
--- a/docker/aarch64/mysql/Dockerfile
+++ b/docker/aarch64/mysql/Dockerfile
@@ -16,8 +16,9 @@ ARG TERM=xterm-256color
 
 RUN echo $TERM
 
-RUN apt update -y \
-    && apt install -y \
+RUN apt-get update \
+    && apt-get install -y \
+        --no-install-recommends \
         curl \
         tar
 
diff --git a/docker/aarch64/sqlite/Dockerfile b/docker/aarch64/sqlite/Dockerfile
index 2424c67b..88f44b6f 100644
--- a/docker/aarch64/sqlite/Dockerfile
+++ b/docker/aarch64/sqlite/Dockerfile
@@ -16,8 +16,9 @@ ARG TERM=xterm-256color
 
 RUN echo $TERM
 
-RUN apt update -y \
-    && apt install -y \
+RUN apt-get update \
+    && apt-get install -y \
+        --no-install-recommends \
         curl \
         tar
 
diff --git a/docker/amd64/mysql/Dockerfile b/docker/amd64/mysql/Dockerfile
index 4368a374..63ce0407 100644
--- a/docker/amd64/mysql/Dockerfile
+++ b/docker/amd64/mysql/Dockerfile
@@ -16,8 +16,9 @@ ARG TERM=xterm-256color
 
 RUN echo $TERM
 
-RUN apt update -y \
-    && apt install -y \
+RUN apt-get update \
+    && apt-get install -y \
+        --no-install-recommends \
         curl \
         tar
 
diff --git a/docker/amd64/postgresql/Dockerfile b/docker/amd64/postgresql/Dockerfile
index 0ba087c7..a6a8f7f5 100644
--- a/docker/amd64/postgresql/Dockerfile
+++ b/docker/amd64/postgresql/Dockerfile
@@ -16,8 +16,9 @@ ARG TERM=xterm-256color
 
 RUN echo $TERM
 
-RUN apt update -y \
-    && apt install -y \
+RUN apt-get update \
+    && apt-get install -y \
+        --no-install-recommends \
         curl \
         tar
 
diff --git a/docker/amd64/sqlite/Dockerfile b/docker/amd64/sqlite/Dockerfile
index f295fad0..a1bb5e5c 100644
--- a/docker/amd64/sqlite/Dockerfile
+++ b/docker/amd64/sqlite/Dockerfile
@@ -16,8 +16,9 @@ ARG TERM=xterm-256color
 
 RUN echo $TERM
 
-RUN apt update -y \
-    && apt install -y \
+RUN apt-get update \
+    && apt-get install -y \
+        --no-install-recommends \
         curl \
         tar
 
diff --git a/docker/armv6/mysql/Dockerfile b/docker/armv6/mysql/Dockerfile
index a89e49b7..b249e09e 100644
--- a/docker/armv6/mysql/Dockerfile
+++ b/docker/armv6/mysql/Dockerfile
@@ -16,8 +16,9 @@ ARG TERM=xterm-256color
 
 RUN echo $TERM
 
-RUN apt update -y \
-    && apt install -y \
+RUN apt-get update \
+    && apt-get install -y \
+        --no-install-recommends \
         curl \
         tar
 
diff --git a/docker/armv6/sqlite/Dockerfile b/docker/armv6/sqlite/Dockerfile
index 3a04b439..4b163a01 100644
--- a/docker/armv6/sqlite/Dockerfile
+++ b/docker/armv6/sqlite/Dockerfile
@@ -16,8 +16,9 @@ ARG TERM=xterm-256color
 
 RUN echo $TERM
 
-RUN apt update -y \
-    && apt install -y \
+RUN apt-get update \
+    && apt-get install -y \
+        --no-install-recommends \
         curl \
         tar
 
diff --git a/docker/armv7/mysql/Dockerfile b/docker/armv7/mysql/Dockerfile
index cf9e25c1..860bf704 100644
--- a/docker/armv7/mysql/Dockerfile
+++ b/docker/armv7/mysql/Dockerfile
@@ -16,8 +16,9 @@ ARG TERM=xterm-256color
 
 RUN echo $TERM
 
-RUN apt update -y \
-    && apt install -y \
+RUN apt-get update \
+    && apt-get install -y \
+        --no-install-recommends \
         curl \
         tar
 
diff --git a/docker/armv7/sqlite/Dockerfile b/docker/armv7/sqlite/Dockerfile
index 33b1bba4..52e49f6d 100644
--- a/docker/armv7/sqlite/Dockerfile
+++ b/docker/armv7/sqlite/Dockerfile
@@ -16,8 +16,9 @@ ARG TERM=xterm-256color
 
 RUN echo $TERM
 
-RUN apt update -y \
-    && apt install -y \
+RUN apt-get update \
+    && apt-get install -y \
+        --no-install-recommends \
         curl \
         tar