Pathnames to repos on the host now live in a config file

ous_run

@@ -1,4 +1,8 @@
 #!/bin/bash
 
+./mktestenvconfig || exit 1
+. testenv_config
+
 docker network create vnc >/dev/null 2>&1
-docker rm ous; docker run -p 5900:5900 --name ous -it -v /home/iang/firefox-build:/home/iang/firefox-build --net=vnc slitheen /bin/bash
+# docker rm ous; docker run -p 5900:5900 --name ous -it -v ${SLITHEEN_FIREFOX_REPO}:/home/iang/firefox --net=vnc slitheen /bin/bash -c 'echo "Waiting for veth to appear..."; while ! ifconfig veth0 >/dev/null 2>&1; do sleep 1; done; sleep 1; ./start_x; export SLITHEEN_PATH=/home/iang/firefox/pubkey; cd firefox && ./mach run'
+docker rm ous; docker run -p 5900:5900 --name ous -it -v ${SLITHEEN_FIREFOX_REPO}:/home/iang/firefox --net=vnc slitheen /bin/bash -c 'cd firefox && bash'

relay_run

@@ -1 +1,7 @@
-docker rm relay; docker run --privileged --name relay -it -v /home/iang/uw/research/slitheen/git/code:/home/iang/slitheen_code slitheen /bin/bash
+#!/bin/bash
+
+./mktestenvconfig || exit 1
+. testenv_config
+
+# docker rm relay; docker run --privileged --name relay -it -v ${SLITHEEN_CODE_REPO}:/home/iang/slitheen_code slitheen /bin/bash -c 'echo "Waiting for veth to appear..."; while ! ifconfig veth1 >/dev/null 2>&1; do sleep 1; done; sleep 1; cd slitheen_code/relay_station && bash'
+docker rm relay; docker run --privileged --name relay -it -v ${SLITHEEN_CODE_REPO}:/home/iang/slitheen_code slitheen /bin/bash -c 'cd slitheen_code/relay_station && bash'

slitheen-docker/Dockerfile

@@ -1,3 +1,3 @@
 FROM ff_build_bootstrapped
 RUN sudo apt-get update
-RUN sudo apt-get install -y inetutils-ping libssl-dev libpcap0.8-dev ethtool tcpdump valgrind iptables telnet
+RUN sudo apt-get install -y inetutils-ping libssl-dev libpcap0.8-dev ethtool tcpdump valgrind iptables telnet less