Merge pull request #1817 from gizmoguy/workaround-pip

Workaround pip
faucetsdn · Mar 26, 2018 · ca37e64 · ca37e64
2 parents 5387b2d + 8a1c4f3
commit ca37e64
Show file tree

Hide file tree

Showing 7 changed files with 2,351 additions and 2,354 deletions.
diff --git a/docker/base/install-faucet.sh b/docker/base/install-faucet.sh
@@ -8,6 +8,9 @@ FROOT=/faucet-src
 
 dir=`dirname $0`
 
+# Clean up
+rm -r "$FROOT/docs"
+
 $APK add -U git $BUILDDEPS && \
   $dir/retrycmd.sh "$PIP3 pip" && \
   $dir/retrycmd.sh "$PIP3 $TESTDEPS" && \
@@ -16,6 +19,3 @@ $APK add -U git $BUILDDEPS && \
   python3 -m pytest $FROOT/tests/test_valve.py && \
   for i in $BUILDDEPS ; do $APK del $i ; done && \
   find / -name \*pyc -delete
-
-# Clean up
-rm -r "$FROOT/docs"
diff --git a/docs/_static/grafana-dashboards/faucet_instrumentation.json b/docs/_static/grafana-dashboards/faucet_instrumentation.json