Merge branch 'master' into karthik/docimprov
diff --git a/docker/Dockerfile.dist.centos7 b/docker/Dockerfile.dist.centos7
index 19044d0..fadc79a 100644
--- a/docker/Dockerfile.dist.centos7
+++ b/docker/Dockerfile.dist.centos7
@@ -22,8 +22,7 @@
RUN mkdir -p /opt/heron && \
tar --strip-components=1 -m -zxvf /heron/heron-core.tar.gz -C /opt/heron
-RUN rm -f /heron/heron-tools-install.sh
-RUN rm -f /heron/heron-core.tar.gz
+RUN rm -f /heron/*
ENV HERON_HOME /opt/heron/heron-core/
RUN export HERON_HOME
diff --git a/docker/Dockerfile.dist.ubuntu14.04 b/docker/Dockerfile.dist.ubuntu14.04
index 2328697..054b128 100644
--- a/docker/Dockerfile.dist.ubuntu14.04
+++ b/docker/Dockerfile.dist.ubuntu14.04
@@ -23,8 +23,7 @@
RUN mkdir -p /opt/heron && \
tar --strip-components=1 -m -zxvf /heron/heron-core.tar.gz -C /opt/heron
-RUN rm -f /heron/heron-tools-install.sh
-RUN rm -f /heron/heron-core.tar.gz
+RUN rm -f /heron/*
ENV HERON_HOME /opt/heron/heron-core/
RUN export HERON_HOME
diff --git a/docker/Dockerfile.dist.ubuntu15.10 b/docker/Dockerfile.dist.ubuntu15.10
index 6694a49..e4a18c2 100644
--- a/docker/Dockerfile.dist.ubuntu15.10
+++ b/docker/Dockerfile.dist.ubuntu15.10
@@ -22,8 +22,7 @@
RUN mkdir -p /opt/heron && \
tar --strip-components=1 -m -zxvf /heron/heron-core.tar.gz -C /opt/heron
-RUN rm -f /heron/heron-tools-install.sh
-RUN rm -f /heron/heron-core.tar.gz
+RUN rm -f /heron/*
ENV HERON_HOME /opt/heron/heron-core/
RUN export HERON_HOME
diff --git a/docker/Dockerfile.dist.ubuntu16.04 b/docker/Dockerfile.dist.ubuntu16.04
index 6694a49..e4a18c2 100644
--- a/docker/Dockerfile.dist.ubuntu16.04
+++ b/docker/Dockerfile.dist.ubuntu16.04
@@ -22,8 +22,7 @@
RUN mkdir -p /opt/heron && \
tar --strip-components=1 -m -zxvf /heron/heron-core.tar.gz -C /opt/heron
-RUN rm -f /heron/heron-tools-install.sh
-RUN rm -f /heron/heron-core.tar.gz
+RUN rm -f /heron/*
ENV HERON_HOME /opt/heron/heron-core/
RUN export HERON_HOME
