updated testenv networking

net_run

@@ -1,3 +1,4 @@
+docker exec --privileged -u root ous route del default
 koko -d ous,veth0,172.17.31.2/16 -d relay,veth1,172.17.31.100/24 || exit 1
 docker exec --privileged -u root ous ethtool -K veth0 tx off tso off ufo off
 docker exec --privileged -u root relay ethtool -K eth0 tso off gro off gso off
@@ -5,7 +6,6 @@ docker exec --privileged -u root relay ethtool -K veth1 tso off gro off gso off
 docker exec --privileged -u root relay ifconfig eth0 mtu 9000
 docker exec --privileged -u root relay ifconfig veth1 mtu 9000
 docker exec --privileged -u root ous ifconfig veth0 mtu 9000
-docker exec --privileged -u root ous route del default gw 172.18.0.1
 docker exec --privileged -u root ous route add default gw 172.17.0.1
 docker exec --privileged -u root relay bash -c "echo 0 > /proc/sys/net/ipv4/ip_forward"
 

ous_run

@@ -5,4 +5,4 @@
 
 docker network create vnc >/dev/null 2>&1
 # 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_PUBKEY=/home/iang/firefox/pubkey; cd firefox && ./mach run'
-docker rm ous; docker run -p 1080:1080 -p 5900:5900 --name ous -it -v ${SLITHEEN_FIREFOX_REPO}:/home/iang/firefox -v ${SLITHEEN_CODE_REPO}:/home/iang/slitheen_code --net=vnc slitheen /bin/bash -c './start_x; export SLITHEEN_PUBKEY=/home/iang/firefox/pubkey; cd firefox && bash'
+docker rm ous; docker run --privileged -p 1080:1080 -p 5900:5900 --name ous -it -v ${SLITHEEN_FIREFOX_REPO}:/home/iang/firefox -v ${SLITHEEN_CODE_REPO}:/home/iang/slitheen_code --net=vnc slitheen /bin/bash -c './start_x; export SLITHEEN_PUBKEY=/home/iang/firefox/pubkey; cd firefox && bash'

slitheen-docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM ff_build_bootstrapped
+FROM ff_bootstrapped_2018_03_25
 RUN sudo apt-get update
 RUN sudo apt-get install -y inetutils-ping libpcap0.8-dev ethtool tcpdump valgrind iptables telnet less dpkg-dev lsb-release libstartup-notification0-dev libjpeg-dev libbz2-dev libreadline-dev python-ply libvpx-dev libhunspell-dev libffi-dev libevent-dev libjsoncpp-dev locales ttf-bitstream-vera fonts-freefont-ttf fonts-dejima-mincho iso-codes software-properties-common
 WORKDIR /tmp/