[incubator-openwhisk] branch master updated: add wskadmin to ow-utils docker image (#4237)

[dg...@apache.org]

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 3a6f6a7  add wskadmin to ow-utils docker image (#4237)
3a6f6a7 is described below

commit 3a6f6a7a1c3842564aed2a007715cba56f474d32
Author: Michele Sciabarra <30...@users.noreply.github.com>
AuthorDate: Fri Jan 25 15:37:16 2019 +0100

    add wskadmin to ow-utils docker image (#4237)
    
    add wskadmin to ow-utils docker image
---
 tools/admin/build.gradle    |  2 --
 tools/ow-utils/Dockerfile   |  4 ++++
 tools/ow-utils/README.md    |  2 +-
 tools/ow-utils/build.gradle | 14 ++++++++++++++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/tools/admin/build.gradle b/tools/admin/build.gradle
index 9d702f1..fe9e656 100644
--- a/tools/admin/build.gradle
+++ b/tools/admin/build.gradle
@@ -51,5 +51,3 @@ dependencies {
     compile 'org.rogach:scallop_2.12:3.1.2'
     scoverage gradle.scoverage.deps
 }
-
-
diff --git a/tools/ow-utils/Dockerfile b/tools/ow-utils/Dockerfile
index 5953d86..1a92aec 100644
--- a/tools/ow-utils/Dockerfile
+++ b/tools/ow-utils/Dockerfile
@@ -39,3 +39,7 @@ RUN wget -q https://github.com/apache/incubator-openwhisk-cli/releases/download/
 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 wskutil.py /bin
+COPY wskprop.py /bin
+COPY wskadmin /bin
diff --git a/tools/ow-utils/README.md b/tools/ow-utils/README.md
index 0a06963..c27f264 100644
--- a/tools/ow-utils/README.md
+++ b/tools/ow-utils/README.md
@@ -25,4 +25,4 @@ for OpenWhisk using most of the tools that are used in the project.
 It includes a JDK8, python/ansible, nodejs, and standard packages
 such as bash, git, wget, curl, and docker.
 
-It also includes the `wsk` and `wskdeploy` CLIs.
+It also includes the `wsk`, `wskdeploy` and `wskadmin` CLIs.
diff --git a/tools/ow-utils/build.gradle b/tools/ow-utils/build.gradle
index c4e7932..c3d4f3e 100644
--- a/tools/ow-utils/build.gradle
+++ b/tools/ow-utils/build.gradle
@@ -17,3 +17,17 @@
 
 ext.dockerImageName = 'ow-utils'
 apply from: '../../gradle/docker.gradle'
+
+distDocker.dependsOn 'copyWskadmin'
+distDocker.finalizedBy('cleanup')
+
+task copyWskadmin(type: Copy) {
+    from '../admin/wskadmin', '../admin/wskutil.py', '../admin/wskprop.py'
+    into '.'
+}
+
+task cleanup(type: Delete) {
+    delete 'wskadmin'
+    delete 'wskprop.py'
+    delete 'wskutil.py'
+}
\ No newline at end of file