vitess_debug.diff

diff --git a/Makefile b/Makefile
index 06446dd88..44db95b84 100644
--- a/Makefile
+++ b/Makefile
@@ -48,6 +48,12 @@ ifndef NOBANNER
 endif
 	go install $(VT_GO_PARALLEL) -ldflags "$(shell tools/build_version_flags.sh)" ./go/...
 
+build_debug:
+ifndef NOBANNER
+	echo $$(date): Building source tree
+endif
+	go install $(VT_GO_PARALLEL) -gcflags=all="-N -l" -ldflags "$(shell tools/build_version_flags.sh)" ./go/...
+
 parser:
 	make -C go/vt/sqlparser
 
diff --git a/docker/base/Dockerfile.mariadb b/docker/base/Dockerfile.mariadb
index a3f977133..958a87004 100644
--- a/docker/base/Dockerfile.mariadb
+++ b/docker/base/Dockerfile.mariadb
@@ -5,9 +5,11 @@ USER root
 COPY . /vt/src/vitess.io/vitess
 
 # Build Vitess
-RUN make build
+RUN make build_debug
 
 # Fix permissions
 RUN chown -R vitess:vitess /vt
 USER vitess
 
+# get delve, the go debugger
+RUN go get -u github.com/go-delve/delve/cmd/dlv
diff --git a/docker/base/Dockerfile.mysql56 b/docker/base/Dockerfile.mysql56
index 5d1f55079..f5af6f27d 100644
--- a/docker/base/Dockerfile.mysql56
+++ b/docker/base/Dockerfile.mysql56
@@ -5,9 +5,11 @@ USER root
 COPY . /vt/src/vitess.io/vitess
 
 # Build Vitess
-RUN make build
+RUN make build_debug
 
 # Fix permissions
 RUN chown -R vitess:vitess /vt
 USER vitess
 
+# get delve, the go debugger
+RUN go get -u github.com/go-delve/delve/cmd/dlv
diff --git a/docker/base/Dockerfile.percona b/docker/base/Dockerfile.percona
index 93a218ff0..1a6fb9a55 100644
--- a/docker/base/Dockerfile.percona
+++ b/docker/base/Dockerfile.percona
@@ -9,4 +9,7 @@ RUN chown -R vitess:vitess /vt
 USER vitess
 
 # Build Vitess
-RUN make build
+RUN make build_debug
+
+# get delve, the go debugger
+RUN go get -u github.com/go-delve/delve/cmd/dlv
diff --git a/docker/base/Dockerfile.percona57 b/docker/base/Dockerfile.percona57
index 4f396c9c8..6bfb2407f 100644
--- a/docker/base/Dockerfile.percona57
+++ b/docker/base/Dockerfile.percona57
@@ -5,9 +5,11 @@ USER root
 COPY . /vt/src/vitess.io/vitess
 
 # Build Vitess
-RUN make build
+RUN make build_debug
 
 # Fix permissions
 RUN chown -R vitess:vitess /vt
 USER vitess
 
+# get delve, the go debugger
+RUN go get -u github.com/go-delve/delve/cmd/dlv