From 16db74fb3ea071c84fde5cc5480185fc8d33692f Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Tue, 13 Oct 2015 13:36:35 -0700
Subject: [PATCH] Build from scripts again

---
 Makefile                | 3 ---
 scripts/monad-docker.sh | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 Makefile

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 5d8100dd23..0000000000
--- a/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-# default rule which passes all arguments to scripts/Makefile
-.DEFAULT:
-	$(MAKE) -C scripts $(MAKECMDGOALS)
diff --git a/scripts/monad-docker.sh b/scripts/monad-docker.sh
index a168d14920..a38bd41af1 100755
--- a/scripts/monad-docker.sh
+++ b/scripts/monad-docker.sh
@@ -11,14 +11,14 @@ monad-tty()
 }
 
 # runs ephemeral andschwa/magrathea docker container with local
-# directory mounted to /opt and workdir set to /opt
+# directory mounted to /opt and workdir set to /opt/scripts
 monad-docker-run()
 {
     local CONSOLE=$1
     shift 1
     docker run --rm \
-	   --volume $(pwd)/:/opt \
-	   --workdir /opt \
+	   --volume $(dirname $(pwd))/:/opt \
+	   --workdir /opt/scripts \
 	   $CONSOLE \
 	   andschwa/magrathea:latest \
 	   bash -c "$(monad-impersonate) -- bash -c '$*'"