From 5a6ef47c509163046998b572db60aa390f12ad20 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Fri, 12 Mar 2021 16:31:14 +0300
Subject: Dockerfile: best practices

---
 dump1090/Dockerfile | 19 ++++++++-----------
 fr24feed/Dockerfile |  9 +++------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/dump1090/Dockerfile b/dump1090/Dockerfile
index f5d2bad..1c8b443 100644
--- a/dump1090/Dockerfile
+++ b/dump1090/Dockerfile
@@ -1,8 +1,5 @@
 FROM debian:stretch-slim AS builder
 
-# Don't prompt:
-ENV DEBIAN_FRONTEND=noninteractive
-
 # Variables:
 ARG DUMP1090_VERSION=3.8.0
 ENV DUMP1090_VERSION="${DUMP1090_VERSION}"
@@ -14,8 +11,9 @@ ADD ["https://github.com/flightaware/dump1090/archive/v${DUMP1090_VERSION}.tar.g
 
     # dump1090 build dependencies (from README at https://github.com/flightaware/dump1090/blob/v3.7.2/README.md):
 RUN build_deps='build-essential debhelper librtlsdr-dev pkg-config dh-systemd libncurses5-dev libbladerf-dev' && \
-    apt-get update -yq && \
-    apt-get install -yq --no-install-recommends $build_deps && \
+    apt-get update && \
+    DEBIAN_FRONTEND=noninteractive \
+        apt-get install -y --no-install-recommends $build_deps && \
     tar xzf dump1090-${DUMP1090_VERSION}.tar.gz && \
     cd -- dump1090-${DUMP1090_VERSION} && \
     dpkg-buildpackage -b && \
@@ -27,19 +25,18 @@ FROM debian:stretch-slim
 
 LABEL maintainer="Egor Tensin <Egor.Tensin@gmail.com>"
 
-# Don't prompt:
-ENV DEBIAN_FRONTEND=noninteractive
-
 WORKDIR /tmp
 
 COPY --from=builder ["/tmp/dump1090-fa.deb", "./"]
 
-RUN apt-get update -yq && \
+RUN apt-get update && \
     # Supervisor to run both dump1090-fa and lighttpd:
     # lighty-enable-mod depends on Term/ReadLine.pm, which isn't listed as a
     # dependency, which is a bug:
-    apt-get install -yq --no-install-recommends supervisor libterm-readline-gnu-perl && \
-    apt-get install -yq ./dump1090-fa.deb && \
+    DEBIAN_FRONTEND=noninteractive \
+        apt-get install -y --no-install-recommends supervisor libterm-readline-gnu-perl && \
+    DEBIAN_FRONTEND=noninteractive \
+        apt-get install -y ./dump1090-fa.deb && \
     rm -- ./dump1090-fa.deb
 
 # Create the /run/dump1090-fa directory, typically created by systemd:
diff --git a/fr24feed/Dockerfile b/fr24feed/Dockerfile
index 14c96fe..e86d481 100644
--- a/fr24feed/Dockerfile
+++ b/fr24feed/Dockerfile
@@ -8,7 +8,6 @@ FROM debian:stretch-slim AS base
 
 # The latest versions of the fr24feed binary for i386/x86_64/armhf according
 # to:
-
 # https://www.flightradar24.com/share-your-data
 #
 # as of 2020-12-13.
@@ -41,13 +40,11 @@ LABEL maintainer="Egor Tensin <Egor.Tensin@gmail.com>"
 
 ENV fr24feed_directory="fr24feed_${fr24feed_archive_suffix}"
 
-# Don't prompt:
-ENV DEBIAN_FRONTEND=noninteractive
-
     # fr24feed dependencies:
 RUN runtime_deps='ca-certificates procps' && \
-    apt-get update -yq && \
-    apt-get install -yq --no-install-recommends $runtime_deps
+    apt-get update && \
+    DEBIAN_FRONTEND=noninteractive \
+        apt-get install -y --no-install-recommends $runtime_deps
 
 COPY --from=builder ["/tmp/$fr24feed_directory", "/tmp/$fr24feed_directory/"]
 COPY ["fr24feed.ini", "/etc/"]
-- 
cgit v1.2.3