[incubator-openwhisk-devtools] branch master updated: Use prebuilt openwhisk images for docker-compose (#25)

[dr...@apache.org]

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

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

The following commit(s) were added to refs/heads/master by this push:
       new  58b6f8a   Use prebuilt openwhisk images for docker-compose (#25)
58b6f8a is described below

commit 58b6f8a108a80f3fe409edeecc3741ad9570952a
Author: Duy Nguyen <du...@gmail.com>
AuthorDate: Sat Jun 3 02:29:11 2017 +0200

    Use prebuilt openwhisk images for docker-compose (#25)
    
    * [docker-compose] - use prebuilt openwhisk images on docker hub without building locally
    * Add docker build command back for dev use cases
    * Use the latest version of openwhisk images
    * fix indentation
    * update build-cli command to avoid confusion with the existing init-whisk-cli one
---
 docker-compose/Makefile           | 11 ++++++++---
 docker-compose/docker-compose.yml |  6 +++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index 7d67e68..4f7d8d4 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -1,6 +1,6 @@
 DOCKER_HOST_IP ?= $(shell echo ${DOCKER_HOST} | grep -o "[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}" || echo localhost)
 DOCKER_REGISTRY ?= ""
-DOCKER_IMAGE_PREFIX ?= whisk
+DOCKER_IMAGE_PREFIX ?= openwhisk
 PROJECT_HOME ?= ./openwhisk-master
 WSK_CLI ?= $(PROJECT_HOME)/bin/wsk
 
@@ -15,7 +15,7 @@ endif
 #   2. then it starts all components using docker-compose
 #   3. it runs a sample hello-world function
 #   To stop and cleanup the environment use: make destroy
-quick-start: download docker run quick-start-pause hello-world quick-start-info
+quick-start: download build-cli run quick-start-pause hello-world quick-start-info
 
 .PHONY: download
 download:
@@ -42,7 +42,12 @@ quick-start-info:
 docker:
 	echo "building the docker images ... "
 	cd $(PROJECT_HOME) && \
-	    ./gradlew distdocker -x :core:swift3Action:distDocker -x :core:swiftAction:distDocker
+		./gradlew distdocker -x :core:swift3Action:distDocker -x :core:swiftAction:distDocker
+
+build-cli:
+	echo "building the CLI tool ... "
+	cd $(PROJECT_HOME) && \
+		./gradlew :tools:cli:distDocker
 
 .PHONY: run
 run: check-required-ports setup start-docker-compose init-couchdb restart-controller init-whisk-cli
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 9504daf..8b4deba 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -51,7 +51,7 @@ services:
 
   # WHISK CONTROLLER
   controller:
-    image: whisk/controller:latest
+    image: openwhisk/controller:latest
     links:
       - consul:consul.docker
       - db:db.docker
@@ -86,9 +86,9 @@ services:
     ports:
       - "8888:8888"
 
-  # WHISK INVOKER AGENT 
+  # WHISK INVOKER AGENT
   invoker:
-    image: whisk/invoker:latest
+    image: openwhisk/invoker:latest
     command: /bin/sh -c "/invoker/bin/invoker 0 >> /logs/invoker-local_logs.log 2>&1"
     links:
       - consul:consul.docker

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