ddragosd commented on a change in pull request #77: Fixes a few linux issues
with the makefile
URL:
https://github.com/apache/incubator-openwhisk-devtools/pull/77#discussion_r160180507
##########
File path: docker-compose/Makefile
##########
@@ -14,12 +20,13 @@ WSK_CLI ?= $(PROJECT_HOME)/bin/wsk
OPEN_WHISK_DB_PREFIX ?= local_
DOCKER_KERNEL ?= $(shell docker version --format "{{.Server.KernelVersion}}")
-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)
-
-
-UNAME_STR ?= $(shell uname)
-
+ifeq ("$(UNAME_STR)","Linux")
+ RUNC_BINARY ?= $(shell (which runc || which docker-runc))
Review comment:
Was this command failing in `Linux` ? I think this happens anyway when the
`DOCKER_KERNEL` is not `*-moby` or `*_boot2docker`.
----------------------------------------------------------------
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
