You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/01/17 12:14:32 UTC

[GitHub] jthomas commented on a change in pull request #72: Updated version of PR-15

jthomas commented on a change in pull request #72: Updated version of PR-15
URL: https://github.com/apache/incubator-openwhisk-devtools/pull/72#discussion_r162032598
 
 

 ##########
 File path: docker-compose/Makefile
 ##########
 @@ -17,26 +17,37 @@ DOCKER_IMAGE_PREFIX ?= openwhisk
 PROJECT_HOME ?= ./openwhisk-master
 WSK_CLI ?= $(PROJECT_HOME)/bin/wsk
 
+DOCKER_NETWORK ?= "openwhisk_default"
+
 OPEN_WHISK_DB_PREFIX ?= local_
 
 DOCKER_KERNEL ?= $(shell docker version --format "{{.Server.KernelVersion}}")
 ifeq ("$(UNAME_STR)","Linux")
 	RUNC_BINARY   ?= $(shell (which runc || which docker-runc))
 	DOCKER_BINARY ?= $(shell (which docker))
-else 
+else
 	RUNC_BINARY   ?= $(shell if [[ $(DOCKER_KERNEL) == *-moby || $(DOCKER_KERNEL) ==  *-boot2docker ]]; then (docker run --rm --privileged --pid=host debian nsenter -t 1 -m -u -n -i sh -c "which runc || which docker-runc"); else (which runc || which docker-runc); fi)
 	DOCKER_BINARY ?= $(shell if [[ $(DOCKER_KERNEL) == *-moby || $(DOCKER_KERNEL) ==  *-boot2docker ]]; then (docker run --rm --privileged --pid=host debian nsenter -t 1 -m -u -n -i sh -c "which docker"); else (which docker); fi)
 endif
 ifndef VERBOSE
 .SILENT:
 endif
 
+.PHONY: deploy
 
 Review comment:
   ? on making catalog addition a separate step. I think most people just wanting to try it out won't need the catalogue in the beginning. I'm also working on a PR to automate adding the package providers (alarms, kafka, couchdb) and this will be a separate step as well.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services