You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by dg...@apache.org on 2018/11/30 20:39:30 UTC
[incubator-openwhisk] branch master updated: add wskdeploy to
scriptRunner Dockerfile (#4144)
This is an automated email from the ASF dual-hosted git repository.
dgrove 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 cbf0584 add wskdeploy to scriptRunner Dockerfile (#4144)
cbf0584 is described below
commit cbf05847c0f9d1658e9e2dc5de5eed2cd540fbb4
Author: David Grove <dg...@users.noreply.github.com>
AuthorDate: Fri Nov 30 15:39:24 2018 -0500
add wskdeploy to scriptRunner Dockerfile (#4144)
Prepare for wskdeploy being used to install catalog
by including wskdeploy cli in this image (which is used
to install the catalog in the kube-deploy project).
---
tools/scriptRunner/Dockerfile | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/scriptRunner/Dockerfile b/tools/scriptRunner/Dockerfile
index 5cc2be2..868a4d5 100644
--- a/tools/scriptRunner/Dockerfile
+++ b/tools/scriptRunner/Dockerfile
@@ -14,6 +14,12 @@ RUN wget -q https://github.com/apache/incubator-openwhisk-cli/releases/download/
tar xzf OpenWhisk_CLI-$WHISK_CLI_VERSION-linux-amd64.tgz -C /usr/local/bin wsk && \
rm OpenWhisk_CLI-$WHISK_CLI_VERSION-linux-amd64.tgz
+# Install `wskdeploy` cli in /usr/local/bin
+ENV WHISKDEPLOY_CLI_VERSION latest
+RUN wget -q https://github.com/apache/incubator-openwhisk-wskdeploy/releases/download/$WHISKDEPLOY_CLI_VERSION/openwhisk_wskdeploy-$WHISKDEPLOY_CLI_VERSION-linux-amd64.tgz && \
+ tar xzf openwhisk_wskdeploy-$WHISK_CLI_VERSION-linux-amd64.tgz -C /usr/local/bin wskdeploy && \
+ rm openwhisk_wskdeploy-$WHISK_CLI_VERSION-linux-amd64.tgz
+
COPY init.sh /init.sh
RUN chmod +x /init.sh