Skip to content

Commit c5bb64b

Browse files
author
Matthew Fisher
committed
Merge pull request #4413 from Joshua-Anderson/dev-registry-linux
fix(Makefile): silence docker-machine warning when it isn't installed
2 parents 7bd72ff + 2817905 commit c5bb64b

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dev-registry: check-docker
2020
@docker inspect registry >/dev/null 2>&1 && docker start registry || docker run --restart="always" -d -p 5000:5000 --name registry registry:0.9.1
2121
@echo
2222
@echo "To use a local registry for Deis development:"
23-
@echo " export DEV_REGISTRY=`docker-machine ip $$(docker-machine active) 2>/dev/null`:5000"
23+
@echo " export DEV_REGISTRY=`docker-machine ip $$(docker-machine active 2>/dev/null) 2>/dev/null || echo $(HOST_IPADDR) `:5000"
2424

2525
dev-cluster: discovery-url
2626
vagrant up

0 commit comments

Comments
 (0)