This is an automated email from the ASF dual-hosted git repository.
csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 5d61ce4 Use Docker ADD command to untar (#3374)
5d61ce4 is described below
commit 5d61ce4863a71d338f098051c11a03d0a3cf759c
Author: Chetan Mehrotra <[email protected]>
AuthorDate: Mon Mar 5 17:22:08 2018 +0530
Use Docker ADD command to untar (#3374)
---
core/controller/Dockerfile | 5 ++---
core/invoker/Dockerfile | 6 ++----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/core/controller/Dockerfile b/core/controller/Dockerfile
index 60d9223..ce772b4 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 1bc2164..0dbe11a 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"]
--
To stop receiving notification emails like this one, please contact
[email protected].
