From 14bff0679f0f811d6b99db051c9419ae8cfa7b32 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Mon, 2 Feb 2015 15:46:57 -0800 Subject: [PATCH] only execute build stack if we have access to /var/run/docker.sock. closes #929 --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 2d85dd334..0f152e5ab 100644 --- a/Makefile +++ b/Makefile @@ -95,12 +95,14 @@ ifndef CI endif stack: +ifeq ($(shell test -e /var/run/docker.sock && touch -a -c /var/run/docker.sock && echo $$?),0) @echo "Start building buildstep" ifdef BUILD_STACK @docker images | grep progrium/buildstep || (git clone ${STACK_URL} /tmp/buildstep && docker build -t progrium/buildstep /tmp/buildstep && rm -rf /tmp/buildstep) else @docker images | grep progrium/buildstep || curl --silent -L ${PREBUILT_STACK_URL} | gunzip -cd | docker import - progrium/buildstep endif +endif count: @echo "Core lines:"