[incubator-heron] branch master updated: Fix for not removing the file heron-core.tar.gz as it is required in heron submit (#3291)

[nwang]

This is an automated email from the ASF dual-hosted git repository.

nwang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git


The following commit(s) were added to refs/heads/master by this push:
     new e167cec  Fix for not removing the file heron-core.tar.gz as it is 
required in heron submit (#3291)
e167cec is described below

commit e167cecba35ae5f581df5aab5638ca805910583d
Author: Windham Wong <windhamw...@nva-hk.com>
AuthorDate: Tue Jun 18 04:21:44 2019 +0800

    Fix for not removing the file heron-core.tar.gz as it is required in heron 
submit (#3291)
---
 docker/dist/Dockerfile.dist.centos7     | 3 +--
 docker/dist/Dockerfile.dist.debian9     | 1 -
 docker/dist/Dockerfile.dist.ubuntu14.04 | 3 +--
 docker/dist/Dockerfile.dist.ubuntu16.04 | 3 +--
 docker/dist/Dockerfile.dist.ubuntu18.04 | 3 +--
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/docker/dist/Dockerfile.dist.centos7 
b/docker/dist/Dockerfile.dist.centos7
index cb6ae7c..950c40a 100644
--- a/docker/dist/Dockerfile.dist.centos7
+++ b/docker/dist/Dockerfile.dist.centos7
@@ -36,8 +36,7 @@ WORKDIR /heron
 
 # run heron installer
 RUN /heron/heron-install.sh \
-    && rm -f /heron/heron-install.sh \
-    && rm -f /usr/local/heron/dist/heron-core.tar.gz
+    && rm -f /heron/heron-install.sh
 
 RUN ln -s /usr/local/heron/dist/heron-core /heron \
     && mkdir -p /heron/heron-tools \
diff --git a/docker/dist/Dockerfile.dist.debian9 
b/docker/dist/Dockerfile.dist.debian9
index 616ff49..f183129 100644
--- a/docker/dist/Dockerfile.dist.debian9
+++ b/docker/dist/Dockerfile.dist.debian9
@@ -34,7 +34,6 @@ WORKDIR /heron
 # run heron installer
 RUN /heron/heron-install.sh && \
     rm -rf /heron/heron-install.sh && \
-    rm -rf /usr/local/heron/dist/heron-core.tar.gz && \
     rm -rf /opt/heron/heron-core/lib/scheduler/heron-local-scheduler.jar && \
     rm -rf /opt/heron/heron-core/lib/scheduler/heron-mesos-scheduler.jar && \
     rm -rf /opt/heron/heron-core/lib/scheduler/heron-slurm-scheduler.jar
diff --git a/docker/dist/Dockerfile.dist.ubuntu14.04 
b/docker/dist/Dockerfile.dist.ubuntu14.04
index 689aceb..04f2602 100644
--- a/docker/dist/Dockerfile.dist.ubuntu14.04
+++ b/docker/dist/Dockerfile.dist.ubuntu14.04
@@ -35,8 +35,7 @@ ADD artifacts /heron
 WORKDIR /heron
 
 # run heron installer
-RUN /heron/heron-install.sh \
-    && rm -f /usr/local/heron/dist/heron-core.tar.gz
+RUN /heron/heron-install.sh
 
 RUN ln -s /usr/local/heron/dist/heron-core /heron \
     && mkdir -p /heron/heron-tools \
diff --git a/docker/dist/Dockerfile.dist.ubuntu16.04 
b/docker/dist/Dockerfile.dist.ubuntu16.04
index f3ae245..cf4be9c 100644
--- a/docker/dist/Dockerfile.dist.ubuntu16.04
+++ b/docker/dist/Dockerfile.dist.ubuntu16.04
@@ -36,8 +36,7 @@ WORKDIR /heron
 
 # run heron installer
 RUN /heron/heron-install.sh \
-    && rm -f /heron/heron-install.sh \
-    && rm -f /usr/local/heron/dist/heron-core.tar.gz
+    && rm -f /heron/heron-install.sh
 
 RUN ln -s /usr/local/heron/dist/heron-core /heron \
     && mkdir -p /heron/heron-tools \
diff --git a/docker/dist/Dockerfile.dist.ubuntu18.04 
b/docker/dist/Dockerfile.dist.ubuntu18.04
index 5f81568..5913990 100644
--- a/docker/dist/Dockerfile.dist.ubuntu18.04
+++ b/docker/dist/Dockerfile.dist.ubuntu18.04
@@ -30,8 +30,7 @@ WORKDIR /heron
 
 # run heron installers
 RUN /heron/heron-install.sh \
-    && rm -f /heron/heron-install.sh \
-    && rm -f /usr/local/heron/dist/heron-core.tar.gz
+    && rm -f /heron/heron-install.sh
 
 RUN ln -s /usr/local/heron/dist/heron-core /heron \
     && mkdir -p /heron/heron-tools \