apt-get: always use --no-install-recommends and apt-get clean

this helps us to avoid installing unneeded packages and removes the
package cache from the images to keep them less bloated.

11 files changed, 124 insertions, 98 deletions

diff --git a/debian-jessie-build/Dockerfile b/debian-jessie-build/Dockerfile
index 2b026d4..411c410 100644
--- a/debian-jessie-build/Dockerfile
+++ b/debian-jessie-build/Dockerfile
@@ -2,44 +2,47 @@ FROM debian:jessie
 
 MAINTAINER Harald Welte <laforge@gnumonks.org>
 
-RUN	apt-get update && apt-get install -y \
-	autoconf \
-	autoconf-archive \
-	autogen \
-	automake \
-	bison \
-	build-essential \
-	cppcheck \
-	debhelper \
-	devscripts \
-	dh-autoreconf \
-	dh-systemd \
-	doxygen \
-	flex \
-	g++ \
-	gawk \
-	gcc \
-	git \
-	git-buildpackage \
-	libc-ares-dev \
-	libdbd-sqlite3 \
-	libdbi-dev \
-	libfftw3-dev \
-	libgps-dev \
-	libgsm1-dev \
-	libortp-dev \
-	libpcap-dev \
-	libpcsclite-dev \
-	libtalloc-dev \
-	libtool \
-	libreadline-dev \
-	libsctp-dev \
-	libsofia-sip-ua-glib-dev \
-	libsqlite3-dev \
-	libssl-dev \
-	libusb-dev \
-	libusb-1.0-0-dev \
-	make \
-	pkg-config \
-	sqlite3 \
-	wget
+RUN	apt-get update && \
+	apt-get upgrade -y && \
+	apt-get install -y --no-install-recommends \
+		autoconf \
+		autoconf-archive \
+		autogen \
+		automake \
+		bison \
+		build-essential \
+		cppcheck \
+		debhelper \
+		devscripts \
+		dh-autoreconf \
+		dh-systemd \
+		doxygen \
+		flex \
+		g++ \
+		gawk \
+		gcc \
+		git \
+		git-buildpackage \
+		libc-ares-dev \
+		libdbd-sqlite3 \
+		libdbi-dev \
+		libfftw3-dev \
+		libgps-dev \
+		libgsm1-dev \
+		libortp-dev \
+		libpcap-dev \
+		libpcsclite-dev \
+		libtalloc-dev \
+		libtool \
+		libreadline-dev \
+		libsctp-dev \
+		libsofia-sip-ua-glib-dev \
+		libsqlite3-dev \
+		libssl-dev \
+		libusb-dev \
+		libusb-1.0-0-dev \
+		make \
+		pkg-config \
+		sqlite3 \
+		wget && \
+	apt-get clean
diff --git a/debian-jessie-buildslave/Dockerfile b/debian-jessie-buildslave/Dockerfile
index dd1c231..04f9fc0 100644
--- a/debian-jessie-buildslave/Dockerfile
+++ b/debian-jessie-buildslave/Dockerfile
@@ -3,7 +3,6 @@ FROM	laforge/debian-jessie-build
 MAINTAINER Harald Welte <laforge@gnumonks.org>
 
 RUN	dpkg --add-architecture i386 && \
-	apt-get upgrade -y && \
 	apt-get install -y --no-install-recommends \
 		asciidoc \
 		bc \
@@ -28,6 +27,7 @@ RUN	useradd --uid=1000 build && \
 
 RUN	pip install timeout_decorator
 
+# first add this file to invalidate cache each time osmo-python-tests.git is updated
 ADD	http://git.osmocom.org/python/osmo-python-tests/patch /tmp/commit-osmo-python-tests
 RUN	git clone git://git.osmocom.org/python/osmo-python-tests && \
 	cd osmo-python-tests && \
diff --git a/debian-jessie-osmocom/Dockerfile b/debian-jessie-osmocom/Dockerfile
index b2f224f..e8eb0f8 100644
--- a/debian-jessie-osmocom/Dockerfile
+++ b/debian-jessie-osmocom/Dockerfile
@@ -8,17 +8,20 @@ RUN	apt-key add /tmp/Release.key && \
 	rm /tmp/Release.key && \
 	echo "deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/ ./" > /etc/apt/sources.list.d/osmocom-nightly.list
 
-RUN	apt-get update && apt-get install -y \
-	telnet \
-	osmocom-sgsn \
-	osmocom-nitb \
-	osmocom-ipaccess-utils \
-	osmocom-gbproxy \
-	osmocom-bsc \
-	osmocom-bsc-nat \
-	osmocom-bs11-utils \
-	openggsn \
-	osmo-bts-trx \
-	osmo-trx \
-	osmo-pcu \
-	osmo-sip-connector
+RUN	apt-get update && \
+	apt-get upgrade -y && \
+	apt-get install -y --no-install-recommends \
+		telnet \
+		osmocom-sgsn \
+		osmocom-nitb \
+		osmocom-ipaccess-utils \
+		osmocom-gbproxy \
+		osmocom-bsc \
+		osmocom-bsc-nat \
+		osmocom-bs11-utils \
+		openggsn \
+		osmo-bts-trx \
+		osmo-trx \
+		osmo-pcu \
+		osmo-sip-connector && \
+	apt-get clean
diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile
index 94c1af5..94608b6 100644
--- a/debian-stretch-titan/Dockerfile
+++ b/debian-stretch-titan/Dockerfile
@@ -5,7 +5,12 @@ MAINTAINER Harald Welte <laforge@gnumonks.org>
 RUN	apt-get update && apt-get install -y \
 	eclipse-titan
 
-RUN	apt-get update && apt-get -y install build-essential git
+RUN	apt-get update && \
+	apt-get upgrade -y && \
+	apt-get -y install \
+		build-essential \
+		git && \
+	apt-get clean
 
 ARG	eclipsegit=https://github.com/eclipse
 ARG	eclipsegit2=git://git.eclipse.org/gitroot/titan
diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile
index 19b1a2f..5fed50e 100644
--- a/osmo-bts-master/Dockerfile
+++ b/osmo-bts-master/Dockerfile
@@ -8,14 +8,16 @@ RUN	apt-key add /tmp/Release.key && \
 	rm /tmp/Release.key && \
 	echo "deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/ ./" > /etc/apt/sources.list.d/osmocom-nightly.list
 
-RUN	apt-get update && apt-get install -y \
-	telnet \
-	libosmocore-dev \
-	libosmo-abis-dev \
-	libosmo-netif-dev \
-	libosmo-sccp-dev \
-	libsmpp34-dev \
-	libgtp-dev
+RUN	apt-get update && \
+	apt-get install -y --no-install-recommends \
+		telnet \
+		libosmocore-dev \
+		libosmo-abis-dev \
+		libosmo-netif-dev \
+		libosmo-sccp-dev \
+		libsmpp34-dev \
+		libgtp-dev &&
+	apt-get clean
 
 WORKDIR	/tmp
 
diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile
index 411090b..5093db7 100644
--- a/osmo-ggsn-master/Dockerfile
+++ b/osmo-ggsn-master/Dockerfile
@@ -8,9 +8,11 @@ RUN	apt-key add /tmp/Release.key && \
 	rm /tmp/Release.key && \
 	echo "deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/ ./" > /etc/apt/sources.list.d/osmocom-nightly.list
 
-RUN	apt-get update && apt-get install -y \
-	telnet \
-	libosmocore-dev
+RUN	apt-get update && \
+	apt-get install -y --no-install-recommends \
+		telnet \
+		libosmocore-dev &&
+	apt-get clean
 
 WORKDIR	/tmp
 
diff --git a/osmo-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile
index 504b489..7fd4fdf 100644
--- a/osmo-nitb-master/Dockerfile
+++ b/osmo-nitb-master/Dockerfile
@@ -8,14 +8,16 @@ RUN	apt-key add /tmp/Release.key && \
 	rm /tmp/Release.key && \
 	echo "deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/ ./" > /etc/apt/sources.list.d/osmocom-nightly.list
 
-RUN	apt-get update && apt-get install -y \
-	telnet \
-	libosmocore-dev \
-	libosmo-abis-dev \
-	libosmo-netif-dev \
-	libosmo-sccp-dev \
-	libsmpp34-dev \
-	libgtp-dev
+RUN	apt-get update && \
+	apt-get install -y --no-install-recommends \
+		telnet \
+		libosmocore-dev \
+		libosmo-abis-dev \
+		libosmo-netif-dev \
+		libosmo-sccp-dev \
+		libsmpp34-dev \
+		libgtp-dev &&
+	apt-get clean
 
 WORKDIR	/tmp
 
diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile
index 426f04f..881e66f 100644
--- a/osmo-sgsn-master/Dockerfile
+++ b/osmo-sgsn-master/Dockerfile
@@ -8,14 +8,16 @@ RUN	apt-key add /tmp/Release.key && \
 	rm /tmp/Release.key && \
 	echo "deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/ ./" > /etc/apt/sources.list.d/osmocom-nightly.list
 
-RUN	apt-get update && apt-get install -y \
-	telnet \
-	libosmocore-dev \
-	libosmo-abis-dev \
-	libosmo-netif-dev \
-	libosmo-sccp-dev \
-	libsmpp34-dev \
-	libgtp-dev
+RUN	apt-get update && \
+	apt-get install -y --no-install-recommends \
+		telnet \
+		libosmocore-dev \
+		libosmo-abis-dev \
+		libosmo-netif-dev \
+		libosmo-sccp-dev \
+		libsmpp34-dev \
+		libgtp-dev &&
+	apt-get clean
 
 WORKDIR	/tmp
 
diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile
index f8a6ccf..f363fc2 100644
--- a/osmo-stp-master/Dockerfile
+++ b/osmo-stp-master/Dockerfile
@@ -8,10 +8,12 @@ RUN	apt-key add /tmp/Release.key && \
 	rm /tmp/Release.key && \
 	echo "deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/ ./" > /etc/apt/sources.list.d/osmocom-nightly.list
 
-RUN	apt-get update && apt-get install -y \
-	telnet \
-	libosmocore-dev \
-	libosmo-netif-dev
+RUN	apt-get update && \
+	apt-get install -y --no-install-recommends \
+		telnet \
+		libosmocore-dev \
+		libosmo-netif-dev && \
+	apt-get clean
 
 WORKDIR	/tmp
 
diff --git a/osmo-virtphy-master/Dockerfile b/osmo-virtphy-master/Dockerfile
index 8c9dab7..2345b06 100644
--- a/osmo-virtphy-master/Dockerfile
+++ b/osmo-virtphy-master/Dockerfile
@@ -8,14 +8,16 @@ RUN	apt-key add /tmp/Release.key && \
 	rm /tmp/Release.key && \
 	echo "deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/ ./" > /etc/apt/sources.list.d/osmocom-nightly.list
 
-RUN	apt-get update && apt-get install -y \
-	telnet \
-	libosmocore-dev \
-	libosmo-abis-dev \
-	libosmo-netif-dev \
-	libosmo-sccp-dev \
-	libsmpp34-dev \
-	libgtp-dev
+RUN	apt-get update && \
+	apt-get install -y --no-install-recommends \
+		telnet \
+		libosmocore-dev \
+		libosmo-abis-dev \
+		libosmo-netif-dev \
+		libosmo-sccp-dev \
+		libsmpp34-dev \
+		libgtp-dev && \
+	apt-get clean
 
 WORKDIR	/tmp
 
diff --git a/sctp-test/Dockerfile b/sctp-test/Dockerfile
index 5281600..9719953 100644
--- a/sctp-test/Dockerfile
+++ b/sctp-test/Dockerfile
@@ -2,8 +2,11 @@ FROM laforge/debian-jessie-build
 
 MAINTAINER Harald Welte <laforge@gnumonks.org>
 
-RUN	apt-get update && apt-get install -y \
-	bison flex
+RUN	apt-get update && \
+	apt-get install -y --no-install-recommends \
+		bison \
+		flex && \
+	apt-get clean
 
 COPY *.patch /tmp/