diff --git a/README.md b/README.md
index 42877643b7e2867e1f7424d7b51040536f51e071..8f815a3608bd2f381b8edb46df4966e20355222c 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ Tendermint officially supports only 64 bit Ubuntu.
 
 #### Docker
 
-WIP
+`$ ./docker_build.sh` to build the image. After that, use ` $ ./docker_run.sh` to run with the default settings.
 
 ### Usage
 
diff --git a/docker_build.sh b/docker_build.sh
index 09deec4bc88134861641923635bb5815e992733c..d6648b85631b3cf5a7c22c8fec2019eaf6509f9f 100755
--- a/docker_build.sh
+++ b/docker_build.sh
@@ -1,2 +1,2 @@
-#! /bin/bash
+#! /bin/sh
 docker build -t eris-db .
\ No newline at end of file
diff --git a/docker_run.sh b/docker_run.sh
old mode 100644
new mode 100755
index 237d35586006bb19208a3a7e9fb349a07984df20..fee8a79b96cf289ea08b2d4f9b403489f8fc05ed
--- a/docker_run.sh
+++ b/docker_run.sh
@@ -1,2 +1,19 @@
-# run eris-db 
-docker run --name eris-db -v  -p 46656:46656 -p 46657:46657 -p 1337:1337 eris-db
+#!/bin/bash
+
+# Using ~/.eris on drive.
+ERIS_PATH=$HOME/.eris
+CONTAINER="eris-db"
+RUNNING=$(docker inspect --format="{{ .State.Running }}" eris-db)
+mkdir -v -p $ERIS_PATH
+
+# Run in the terminal and attach on start.
+if [ "$RUNNING" == "true" ]; then
+  echo "Container 'eris-db' already running. Exiting."
+  exit 1
+elif [ "$RUNNING" == "false" ]; then
+  echo "Container 'eris-db' found. Starting."
+  docker start --attach=true eris-db
+else
+  echo "Container 'eris-db' not found. Creating."
+  docker run --name eris-db -v $ERIS_PATH:/home/eris/.eris -p 46656:46656 -p 46657:46657 -p 1337:1337 eris-db
+fi
\ No newline at end of file
diff --git a/run.sh b/run.sh
deleted file mode 100755
index 1a2485251c33a70432394c93fb89330ef214bfc9..0000000000000000000000000000000000000000
--- a/run.sh
+++ /dev/null
@@ -1 +0,0 @@
-#!/bin/sh