Merge branch 'master' into fixup-node8

18F · Feb 21, 2018 · 1a116bd · 1a116bd
2 parents 7ab0399 + 9b206c9
commit 1a116bd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -127,7 +127,6 @@ Let's also load example requirements, agencies, and a whole document:
 ```bash
 bin/manage.py fetch_csv
 bin/manage.py import_reqs data.csv
-bin/manage.py sync_agencies
 bin/manage.py import_xml_doc example_docs/m_16_19_1.xml M-16-19
 bin/manage.py import_xml_doc example_docs/m_15_16.xml M-15-16
 ```

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -91,6 +91,8 @@ services:
     working_dir: /usr/src/app/styleguide
     entrypoint: .docker/deps_ok_then .docker/modify_path_then
     command: .docker/build_run_styleguide
+    environment:
+      USE_POLLING: ${USE_POLLING:-false}
     ports:
       - 3000:3000
     volumes:

diff --git a/styleguide/.docker/build_run_styleguide b/styleguide/.docker/build_run_styleguide
@@ -2,5 +2,5 @@
 
 set -e
 
-webpack --watch &
-fractal start --sync
+node node_modules/webpack/bin/webpack.js --watch &
+./node_modules/@frctl/fractal/bin/fractal start --sync
diff --git a/styleguide/.docker/deps_ok_then b/styleguide/.docker/deps_ok_then
@@ -1,11 +1,13 @@
 #!/bin/bash
 
-if [ ! -x node_modules/.bin/deps-ok ]; then
+export DEPS_OK=./node_modules/deps-ok/bin/deps-ok.js
+
+if [ ! -x $DEPS_OK ]; then
   echo "Installing deps-ok"
   npm install --save-dev deps-ok
 fi
 
-./node_modules/.bin/deps-ok &> /dev/null
+$DEPS_OK &> /dev/null
 if [ $? -ne 0 ]; then
   echo "Installing Node dependencies"
   npm install