From 1abf22718a6478b90214228573626878cd244f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Mon, 12 Nov 2018 15:55:19 +0100 Subject: [PATCH] Fix Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 9c1dff5..eae14d8 100644 --- a/Makefile +++ b/Makefile @@ -18,11 +18,11 @@ release: build quickstart: @echo "Starting saltstack-master container..." - @docker run --name='saltstack-master-demo' -d \ + @docker run --name='saltstack-master-demo' --detach \ --publish=4505:4505/tcp --publish=4506:4506/tcp \ - --env "USERMAP_UID=$(id -u)" --env "USERMAP_GID=$(id -g)" \ + --env "USERMAP_UID=$(shell id -u)" --env "USERMAP_GID=$(shell id -g)" \ --env SALT_LOG_LEVEL=info \ - --read-only --volume $(pwd)/srv/:/home/salt/data/srv/ \ + --read-only --volume $(shell pwd)/srv/:/home/salt/data/srv/ \ cdalvaro/saltstack-master:latest @echo "Type 'make logs' for the logs" @@ -35,4 +35,4 @@ purge: stop @docker rm saltstack-master-demo > /dev/null logs: - @docker logs -d saltstack-master-demo + @docker logs --follow saltstack-master-demo