You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by mr...@apache.org on 2017/06/26 15:20:00 UTC

[incubator-openwhisk-deploy-kube] branch master updated: Update README to address issue 17 (#19)

This is an automated email from the ASF dual-hosted git repository.

mrutkowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-deploy-kube.git


The following commit(s) were added to refs/heads/master by this push:
     new 962e7ea  Update README to address issue 17 (#19)
962e7ea is described below

commit 962e7ea5eedb6ed72bcd05e266832539f231e55e
Author: Dan Lavine <dl...@us.ibm.com>
AuthorDate: Mon Jun 26 10:19:42 2017 -0500

    Update README to address issue 17 (#19)
    
    * Update README to address issue 17
    
    * Fix typo
    
    * Update cli_path to cli.path
---
 README.md                                      | 7 +++++++
 ansible-kube/roles/routemgmt/tasks/deploy.yml  | 2 +-
 ansible-kube/tasks/installOpenwhiskCatalog.yml | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 30d2997..38aa628 100644
--- a/README.md
+++ b/README.md
@@ -198,6 +198,13 @@ to download the [OpenWhisk repo](https://github.com/openwhisk/openwhisk)
 and setup your invironment to build the docker images via gradle. That
 setup can be found [here](https://github.com/apache/incubator-openwhisk#native-development).
 
+**Important**
+To build custom docker images, you will need to be on a Linux machine.
+During the `wsk` cli build process it mounts a number of files from the
+host machine. Because of this, Golang determines that the `wsk` build
+architecture should be for macOS, but of course this is the wrong version
+when running later. It needs to be built for the Linux architecture.
+
 To use the script, it takes in 2 arguments:
 1. (Required) The first argument is the Docker account to push the built images
    to. For Nginx, it will tag the image as `account_name/whisk_nginx:latest`
diff --git a/ansible-kube/roles/routemgmt/tasks/deploy.yml b/ansible-kube/roles/routemgmt/tasks/deploy.yml
index a797e7b..d9858cf 100644
--- a/ansible-kube/roles/routemgmt/tasks/deploy.yml
+++ b/ansible-kube/roles/routemgmt/tasks/deploy.yml
@@ -1,6 +1,6 @@
 ---
 # Install the API Gateway route management actions.
 - name: install route management actions
-  shell: ./installRouteMgmt.sh {{ catalog_auth_key }} {{ nginx_host }} {{ catalog_namespace }} {{ cli_path }} chdir="{{ openwhisk_home }}/ansible/roles/routemgmt/files"
+  shell: ./installRouteMgmt.sh {{ catalog_auth_key }} {{ nginx_host }} {{ catalog_namespace }} {{ cli.path }} chdir="{{ openwhisk_home }}/ansible/roles/routemgmt/files"
   environment:
     OPENWHISK_HOME: "{{ openwhisk_home }}"
diff --git a/ansible-kube/tasks/installOpenwhiskCatalog.yml b/ansible-kube/tasks/installOpenwhiskCatalog.yml
index 7064e27..56b53f8 100644
--- a/ansible-kube/tasks/installOpenwhiskCatalog.yml
+++ b/ansible-kube/tasks/installOpenwhiskCatalog.yml
@@ -29,6 +29,6 @@
     version: "{{ version }}"
 
 - name: install the catalog from the catalog location
-  shell: ./installCatalog.sh {{ catalog_auth_key }} {{ api_host }} {{ catalog_namespace }} {{ cli_path }} chdir="{{ catalog_location }}/packages"
+  shell: ./installCatalog.sh {{ catalog_auth_key }} {{ api_host }} {{ catalog_namespace }} {{ cli.path }} chdir="{{ catalog_location }}/packages"
   environment:
     OPENWHISK_HOME: "{{ openwhisk_home }}"

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].