From 20e5e69131dbec4c5a23e992adf52797763f5f84 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sun, 9 Apr 2017 03:16:20 -0500 Subject: [PATCH] Add check to see if Docker is installed --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a7a02661..acfc36b9 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,10 @@ OS=$(shell uname | tr [:upper:] [:lower:]) HOST_ENV=${OS}-$(shell uname -m) DEVENV=devenv$(shell pwd | sed 's/\//-/g') DEVENV_IMAGE=wombatant/nostalgia-devenv -ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running) - ENV_RUN=docker exec --user $(shell id -u ${USER}) ${DEVENV} +ifneq ($(shell which docker),) + ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running) + ENV_RUN=docker exec --user $(shell id -u ${USER}) ${DEVENV} + endif endif make: