[GitHub] csantanapr closed pull request #3374: Use Docker ADD command to untar

[GitBox <gi...@apache.org>]

csantanapr closed pull request #3374: Use Docker ADD command to untar
URL: https://github.com/apache/incubator-openwhisk/pull/3374
 
 
   

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/core/controller/Dockerfile b/core/controller/Dockerfile
index 60d92237ce..ce772b497d 100644
--- a/core/controller/Dockerfile
+++ b/core/controller/Dockerfile
@@ -9,11 +9,10 @@ RUN curl -sSL -o swagger-ui-v3.6.0.tar.gz --no-verbose https://github.com/swagge
 
 #
 # Copy app jars
-COPY build/distributions/controller.tar /
-RUN tar xf controller.tar
+ADD build/distributions/controller.tar /
 
 COPY init.sh /
 RUN chmod +x init.sh
 
 EXPOSE 8080
-CMD ["init.sh", "0"]
\ No newline at end of file
+CMD ["./init.sh", "0"]
\ No newline at end of file
diff --git a/core/invoker/Dockerfile b/core/invoker/Dockerfile
index 1bc2164e45..0dbe11ac93 100644
--- a/core/invoker/Dockerfile
+++ b/core/invoker/Dockerfile
@@ -19,12 +19,10 @@ RUN wget --no-verbose https://storage.googleapis.com/kubernetes-release/release/
 chmod +x kubectl && \
 mv kubectl /usr/bin/kubectl
 
-COPY build/distributions/invoker.tar ./
-RUN tar xf invoker.tar && \
-rm -f invoker.tar
+ADD build/distributions/invoker.tar ./
 
 COPY init.sh /
 RUN chmod +x init.sh
 
 EXPOSE 8080
-CMD ["init.sh", "0"]
+CMD ["./init.sh", "0"]


 

----------------------------------------------------------------
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