You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by GitBox <gi...@apache.org> on 2019/01/08 19:01:47 UTC

[GitHub] nwangtw closed pull request #3146: remove .sh files from docker image

nwangtw closed pull request #3146: remove .sh files from docker image
URL: https://github.com/apache/incubator-heron/pull/3146
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/docker/dist/Dockerfile.dist.debian9 b/docker/dist/Dockerfile.dist.debian9
index 71c5cc08f2..d7394e3b93 100644
--- a/docker/dist/Dockerfile.dist.debian9
+++ b/docker/dist/Dockerfile.dist.debian9
@@ -36,7 +36,7 @@ WORKDIR /heron
 RUN /heron/heron-install.sh && \
     tar --strip-components=1 -m -zxvf /heron/heron-core.tar.gz -C /heron && \
     rm -rf /heron/heron-core.tar.gz && \
-    rm -rf /heron/heron-tools-install.sh && \
+    rm -rf /heron/heron-install.sh && \
     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 0248944333..e448fe7360 100644
--- a/docker/dist/Dockerfile.dist.ubuntu14.04
+++ b/docker/dist/Dockerfile.dist.ubuntu14.04
@@ -48,6 +48,7 @@ RUN curl -O "http://www.apache.org/dist/zookeeper/$ZK_DIST/$ZK_DIST.tar.gz" \
     && tar -xzf /heron/$ZK_DIST.tar.gz -C /opt \
     && rm -r /heron/$ZK_DIST.tar.gz \
     && mv /opt/$ZK_DIST /opt/zookeeper \
+    && rm -rf /heron/heron-install.sh \
     && rm -rf /opt/zookeeper/CHANGES.txt \
     /opt/zookeeper/README.txt \
     /opt/zookeeper/NOTICE.txt \


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services