Remove bower components path from settings file

This is already defined in the bowerrc file

Fixes #263
This commit is contained in:
Roland Geider
2016-07-19 23:38:13 +02:00
parent 89efba0f05
commit f90f0204a8
3 changed files with 4 additions and 5 deletions

View File

@@ -38,7 +38,7 @@ Improvements:
* Remove hard-coded CC licence from documentation and website `#247`_
Other improvements and bugfixes: `#243`_, `#279`_, `#275`_, `#270`_, `#258`_, `#257`_,
`#269`_, `#296`_, `#297`_, `#303`_
`#263`_, `#269`_, `#296`_, `#297`_, `#303`_
.. _#78: https://github.com/wger-project/wger/issues/78
@@ -50,6 +50,7 @@ Other improvements and bugfixes: `#243`_, `#279`_, `#275`_, `#270`_, `#258`_, `#
.. _#247: https://github.com/wger-project/wger/issues/247
.. _#257: https://github.com/wger-project/wger/issues/257
.. _#258: https://github.com/wger-project/wger/issues/258
.. _#263: https://github.com/wger-project/wger/issues/263
.. _#269: https://github.com/wger-project/wger/issues/269
.. _#270: https://github.com/wger-project/wger/issues/270
.. _#272: https://github.com/wger-project/wger/issues/272

View File

@@ -46,10 +46,9 @@ RUN chmod o+w -R ~/db/ \
&& chmod o+w ~/media \
&& sed -i "/^MEDIA_ROOT/c\MEDIA_ROOT='\/home\/wger\/media'" settings.py \
&& echo STATIC_ROOT=\'/home/wger/static\' >> settings.py \
&& mkdir /home/wger/src/components \
&& python manage.py collectstatic --noinput
USER root
ENTRYPOINT ["/usr/sbin/apache2ctl"]
CMD ["-D", "FOREGROUND"]
CMD ["-D", "FOREGROUND"]

View File

@@ -324,8 +324,7 @@ COMPRESS_CSS_FILTERS = (
)
COMPRESS_ROOT = STATIC_ROOT
# BOWER components route
BOWER_COMPONENTS_ROUTE = os.path.join(STATIC_ROOT, 'components')
# BOWER binary
if sys.platform.startswith('win32'):
BOWER_PATH = os.path.join(BASE_DIR, 'node_modules', '.bin', 'bower.cmd')
else: