Merge pull request #3060 from octo/issue/2973

contrib/docker/: Switch to Debian slim, separate ENTRYPOINT/CMD, install suggestions.

diff --git a/contrib/docker/50docker-apt-conf b/contrib/docker/50docker-apt-conf
index 1b71704..43b0ec9 100644 (file)
--- a/contrib/docker/50docker-apt-conf
+++ b/contrib/docker/50docker-apt-conf
@@ -1,4 +1,4 @@
 APT::Install-Recommends "1";
-APT::Install-Suggests "0";
+APT::Install-Suggests "1";
 APT::Get::Assume-Yes "1";
 APT::Get::AutomaticRemove "1";

diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile
index a691f2e..fcb46b1 100644 (file)
--- a/contrib/docker/Dockerfile
+++ b/contrib/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stable
+FROM debian:stable-slim
 
 ENV DEBIAN_FRONTEND noninteractive
 COPY 50docker-apt-conf /etc/apt/apt.conf.d/
@@ -21,4 +21,5 @@ COPY collectd.conf.d /etc/collectd/collectd.conf.d
 
 ENV LD_PRELOAD /usr/src/rootfs_prefix/rootfs_prefix.so
 
-CMD [ "/usr/sbin/collectd", "-f"]
+ENTRYPOINT ["/usr/sbin/collectd"]
+CMD ["-f"]