Shillaker commented on a change in pull request #72: Updated version of PR-15
URL:
https://github.com/apache/incubator-openwhisk-devtools/pull/72#discussion_r162024868
##########
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:
It's meant to be run instead of `quick-start` to set up a fully-fledged
environment without `hello-world` and with catalog and route management.
However, now that I think about it we could either:
- change `quick-start` to include catalog and route management OR
- change the process to be 1) run `quick-start` 2) run extra steps if you
want to add catalog and route management (a bit more like
https://github.com/apache/incubator-openwhisk-devtools/pull/82)
Either way there should be some docs which I can add.
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services
