Runc is never used and in newer Docker for Mac versions it is not available, the compose disables it by default as well. (#84)
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 @@
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 @@
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 @@
- ~/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"
