[incubator-openwhisk-devtools] branch master updated: Runc is never used and in newer Docker for Mac versions it is not available, the compose disables it by default as well. (#84)

[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 92b19a5  Runc is never used and in newer Docker for Mac versions it is not available, the compose disables it by default as well. (#84)
92b19a5 is described below

commit 92b19a565608d7534a7acac8b14849ff86cff198
Author: dan mcweeney <me...@danmcweeney.com>
AuthorDate: Tue Jan 23 11:43:59 2018 -0500

    Runc is never used and in newer Docker for Mac versions it is not available, the compose disables it by default as well. (#84)
---
 docker-compose/Makefile           | 3 ---
 docker-compose/docker-compose.yml | 2 --
 2 files changed, 5 deletions(-)

diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index 69d73dd..069748b 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -21,10 +21,8 @@ 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 
-	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
@@ -103,7 +101,6 @@ setup:
 	cp -r ./apigateway/* ~/tmp/openwhisk/apigateway/
 	> ~/tmp/openwhisk/local.env
 	printf "DOCKER_BINARY=$(DOCKER_BINARY)\n" >> ~/tmp/openwhisk/local.env
-	printf "RUNC_BINARY=$(RUNC_BINARY)\n" >> ~/tmp/openwhisk/local.env
 	printf "DOCKER_COMPOSE_HOST=$(DOCKER_HOST_IP)\n" >> ~/tmp/openwhisk/local.env
 	printf "DOCKER_REGISTRY=$(DOCKER_REGISTRY)\n" >> ~/tmp/openwhisk/local.env
 	printf "DOCKER_IMAGE_PREFIX=$(DOCKER_IMAGE_PREFIX)\n" >> ~/tmp/openwhisk/local.env
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 94c813a..c05601e 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -116,8 +116,6 @@ services:
       - ~/tmp/openwhisk/invoker/logs:/logs
       - /var/run/docker.sock:/var/run/docker.sock
       - /var/lib/docker/containers:/containers
-      - ${RUNC_BINARY}:/usr/bin/docker-runc
-      - /run/runc:/run/runc
       - /sys/fs/cgroup:/sys/fs/cgroup
     ports:
       - "8085:8085"

-- 
To stop receiving notification emails like this one, please contact
dragos@apache.org.