From 27870e9c5019f985816416e136a5f90723dbe3eb Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Fri, 17 Jun 2022 19:09:25 +0300
Subject: [PATCH] Dockerfile optimization: --no-install-recommends ; rm -rf
 /var/lib/apt/lists/* ; apt-get purge -y --auto-remove

---
 msa/tb/docker-cassandra/Dockerfile | 6 ++++--
 msa/tb/docker-postgres/Dockerfile  | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/msa/tb/docker-cassandra/Dockerfile b/msa/tb/docker-cassandra/Dockerfile
index 9d16d46ef5..f4d00a8d37 100644
--- a/msa/tb/docker-cassandra/Dockerfile
+++ b/msa/tb/docker-cassandra/Dockerfile
@@ -44,15 +44,17 @@ ENV CASSANDRA_LOG=/var/log/cassandra
 COPY logback.xml ${pkg.name}.conf start-db.sh stop-db.sh start-tb.sh upgrade-tb.sh install-tb.sh ${pkg.name}.deb /tmp/
 
 RUN apt-get update \
-    && apt-get install -y curl nmap procps gnupg2 \
+    && apt-get install -y --no-install-recommends curl nmap procps gnupg2 \
     && echo "deb http://apt.postgresql.org/pub/repos/apt/ $(. /etc/os-release && echo -n $VERSION_CODENAME)-pgdg main" | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null \
     && curl -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
     && echo 'deb http://downloads.apache.org/cassandra/debian 40x main' | tee --append /etc/apt/sources.list.d/cassandra.list > /dev/null \
     && curl -L https://downloads.apache.org/cassandra/KEYS | apt-key add - \
     && apt-get update \
-    && apt-get install -y cassandra cassandra-tools postgresql-12 \
+    && apt-get install -y --no-install-recommends cassandra cassandra-tools postgresql-${PG_MAJOR} \
+    && rm -rf /var/lib/apt/lists/* \
     && update-rc.d cassandra disable \
     && update-rc.d postgresql disable \
+    && apt-get purge -y --auto-remove \
     && sed -i.old '/ulimit/d' /etc/init.d/cassandra \
     && chmod a+x /tmp/*.sh \
     && mv /tmp/start-tb.sh /usr/bin \
diff --git a/msa/tb/docker-postgres/Dockerfile b/msa/tb/docker-postgres/Dockerfile
index 5dfdba41bd..90616c2ff0 100644
--- a/msa/tb/docker-postgres/Dockerfile
+++ b/msa/tb/docker-postgres/Dockerfile
@@ -36,12 +36,14 @@ ENV PGLOG=/var/log/postgres
 COPY logback.xml ${pkg.name}.conf start-db.sh stop-db.sh start-tb.sh upgrade-tb.sh install-tb.sh ${pkg.name}.deb /tmp/
 
 RUN apt-get update \
-    && apt-get install -y curl gnupg2 \
+    && apt-get install -y --no-install-recommends curl gnupg2 \
     && echo "deb http://apt.postgresql.org/pub/repos/apt/ $(. /etc/os-release && echo -n $VERSION_CODENAME)-pgdg main" | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null \
     && curl -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
     && apt-get update \
-    && apt-get install -y postgresql-12 \
+    && apt-get install -y --no-install-recommends postgresql-${PG_MAJOR} \
+    && rm -rf /var/lib/apt/lists/* \
     && update-rc.d postgresql disable \
+    && apt-get purge -y --auto-remove \
     && chmod a+x /tmp/*.sh \
     && mv /tmp/start-tb.sh /usr/bin \
     && mv /tmp/upgrade-tb.sh /usr/bin \