Skip to content

Commit

Permalink
Build webpack frontend files before collecting static files during te…
Browse files Browse the repository at this point in the history
…sts.

Also adds the directories for collected static files and for webpack bundles
to .dockerignore so that they don't get copied into docker images and mask
build problems that will arise on Circle.
  • Loading branch information
Michael Kelly committed Jul 10, 2018
1 parent bf46da6 commit d8cb66d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .dockerignore
Expand Up @@ -5,3 +5,5 @@ __pycache__
.vagrant
Vagrantfile
.cache
webapp-django/node_modules
webapp-django/static
1 change: 1 addition & 0 deletions docker/run_tests.sh
Expand Up @@ -50,6 +50,7 @@ if [ "${USEPYTHON:-2}" == "2" ]; then

# Collect static and then run py.test in the webapp
pushd webapp-django
"${WEBPACK_BINARY}" --mode=production --bail
python manage.py collectstatic --noinput
"${PYTEST}"
popd
Expand Down

0 comments on commit d8cb66d

Please sign in to comment.