From 87bab63aa2451f3274407fc185a0f0ed415fdc4a Mon Sep 17 00:00:00 2001
From: James Hillyerd <james@hillyerd.com>
Date: Sat, 31 Mar 2018 16:11:12 -0700
Subject: [PATCH] docker: Default to JSON log output for #90

---
 Dockerfile | 3 ++-
 Makefile   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5bc5da56..b7168025 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,8 @@ VOLUME /config
 VOLUME /storage
 
 WORKDIR $INBUCKET_HOME
-ENTRYPOINT "/start-inbucket.sh"
+ENTRYPOINT ["/start-inbucket.sh"]
+CMD ["-logjson"]
 
 # Build Inbucket
 COPY . $INBUCKET_SRC/
diff --git a/Makefile b/Makefile
index ff275c09..857fca59 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ $(commands): %: cmd/%
 clean:
 	go clean $(PKGS)
 	rm -f $(commands)
+	rm -rf dist
 
 deps:
 	go get -t ./...