From 0674196ef9390d79f2b12b121f6bdc81a8c22ddf Mon Sep 17 00:00:00 2001 From: Kyle Ondy Date: Fri, 15 Apr 2016 09:54:07 -0400 Subject: [PATCH 1/2] Remove trailing whitespace --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4e5d2a4c..5688368d 100644 --- a/Makefile +++ b/Makefile @@ -6,10 +6,10 @@ NAME = tvial/docker-mailserver:$(BRANCH) all: build-no-cache build-no-cache: - docker build --no-cache -t $(NAME) . + docker build --no-cache -t $(NAME) . build: - docker build --no-cache -t $(NAME) . + docker build --no-cache -t $(NAME) . run: # Run containers From 6be463299aba1c589f4190120b90554e83bf68fd Mon Sep 17 00:00:00 2001 From: Kyle Ondy Date: Fri, 15 Apr 2016 09:54:23 -0400 Subject: [PATCH 2/2] `make build` builds with cache As `make build-no-cache` was added, it seems appropriate that `make build` should build with the cache, so I have removed the `--no-cache` option. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5688368d..31019432 100644 --- a/Makefile +++ b/Makefile @@ -3,13 +3,13 @@ NAME = tvial/docker-mailserver:$(BRANCH) # all: build-no-cache run fixtures tests clean #all-no-build: run fixtures tests clean -all: build-no-cache +all: build-no-cache build-no-cache: docker build --no-cache -t $(NAME) . build: - docker build --no-cache -t $(NAME) . + docker build -t $(NAME) . run: # Run containers