test: add killall to dockerfile. cleanup

glide.lock

@@ -86,7 +86,7 @@ imports:
   subpackages:
   - term
 - name: github.com/tendermint/tmsp
-  version: 58bacfb04e36cf4babae25da3b9068ae91dc662b
+  version: ead192adbbbf85ac581cf775b18ae70d59f86457
   subpackages:
   - client
   - example/counter

scripts/glide/status.sh

@@ -8,6 +8,7 @@ GLIDE=$GOPATH/src/github.com/tendermint/tendermint/glide.lock
 LIBS=($(grep "github.com/tendermint" $GLIDE  | awk '{print $3}'))
 
 
+UPTODATE=true
 for lib in "${LIBS[@]}"; do
 	# get vendored commit
 	VENDORED=`grep -A1 $lib $GLIDE | grep -v $lib | awk '{print $2}'`
@@ -18,6 +19,7 @@ for lib in "${LIBS[@]}"; do
 	cd $PWD
 	
 	if [[ "$VENDORED" != "$MASTER" ]]; then
+		UPTODATE=false
 		echo ""
 		if [[ "$VENDORED" != "$HEAD" ]]; then
 			echo "Vendored version of $lib differs from origin/master and HEAD"
@@ -32,3 +34,7 @@ for lib in "${LIBS[@]}"; do
 	fi
 done
 
+if [[ "$UPTODATE" == "true" ]]; then
+	echo "All vendored versions up to date"
+fi
+

scripts/glide/update.sh

@@ -8,7 +8,7 @@ LIB=$1
 
 GLIDE=$GOPATH/src/github.com/tendermint/tendermint/glide.lock
 
-OLD_COMMIT=`bash scripts/glide/parse.sh $GLIDE $LIB`
+OLD_COMMIT=`bash scripts/glide/parse.sh $LIB`
 
 PWD=`pwd`
 cd $GOPATH/src/github.com/tendermint/$LIB

test/docker/Dockerfile

@@ -1,19 +1,19 @@
 # Pull base image.
 FROM golang:1.6
 
-# Grab deps (jq, hexdump, xxd)
+# Grab deps (jq, hexdump, xxd, killall)
 RUN apt-get update && \
   apt-get install -y --no-install-recommends \
-  jq bsdmainutils vim-common && \ 
-  rm -rf /var/lib/apt/lists/*
-
-ENV TENDERMINT_ORG $GOPATH/src/github.com/tendermint/
-RUN mkdir -p $TENDERMINT_ORG
-COPY . $TENDERMINT_ORG/tendermint
-WORKDIR $TENDERMINT_ORG/tendermint
+  jq bsdmainutils vim-common psmisc 
 
+ENV REPO $GOPATH/src/github.com/tendermint/tendermint
+WORKDIR $REPO
+ADD glide.yaml glide.yaml
+ADD glide.lock glide.lock
+ADD Makefile Makefile
 RUN make get_vendor_deps
 
+COPY . $REPO
 
 RUN go install ./cmd/tendermint
 RUN bash scripts/install_tmsp_apps.sh

test/docker/DockerfileDev

@@ -1,3 +0,0 @@
-FROM tester
-
-VOLUME /go/bin