Self hosted FLOSS fitness/workout, nutrition and weight tracker
Remove bower components path from settings file
Roland Geiderf90f0204a89c
diff --git a/docs/changelog.rst b/docs/changelog.rstindex 76cfc9e02..6b4458582 100644--- a/docs/changelog.rst+++ b/docs/changelog.rst@@ -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/272diff --git a/extras/docker/apache/Dockerfile b/extras/docker/apache/Dockerfileindex f8a1f0185..a2a4cee91 100644--- a/extras/docker/apache/Dockerfile+++ b/extras/docker/apache/Dockerfile@@ -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 --noinputUSER rootENTRYPOINT ["/usr/sbin/apache2ctl"]-CMD ["-D", "FOREGROUND"]\ No newline at end of file+CMD ["-D", "FOREGROUND"]diff --git a/wger/settings_global.py b/wger/settings_global.pyindex 8b0187ba8..d72ff4131 100644--- a/wger/settings_global.py+++ b/wger/settings_global.py@@ -324,8 +324,7 @@ COMPRESS_CSS_FILTERS = ()COMPRESS_ROOT = STATIC_ROOT-# BOWER components route-BOWER_COMPONENTS_ROUTE = os.path.join(STATIC_ROOT, 'components')+# BOWER binaryif sys.platform.startswith('win32'):BOWER_PATH = os.path.join(BASE_DIR, 'node_modules', '.bin', 'bower.cmd')else: