Self hosted FLOSS fitness/workout, nutrition and weight tracker
Install nodejs linting modules
Roland Geider801f50718bb5
diff --git a/extras/docker/base/Dockerfile b/extras/docker/base/Dockerfileindex 8a86006c7..400389a6c 100644--- a/extras/docker/base/Dockerfile+++ b/extras/docker/base/Dockerfile@@ -8,7 +8,7 @@# docker build --tag wger/base .#-FROM ubuntu:15.04+FROM ubuntu:16.04MAINTAINER Roland Geider <[email protected]>diff --git a/extras/docker/development-fedora/Dockerfile b/extras/docker/development-fedora/Dockerfileindex fc0d5779b..6036f8bb4 100644--- a/extras/docker/development-fedora/Dockerfile+++ b/extras/docker/development-fedora/Dockerfile@@ -8,14 +8,14 @@# (in docker) python manage.py runserver 0.0.0.0:8000##-FROM fedora:23+FROM fedora:24MAINTAINER Roland Geider <[email protected]># Install dependenciesRUN dnf update;\dnf install -y python3-devel python-virtualenv \nodejs npm libjpeg-turbo-devel zlib-devel git \- tmux sudo+ tmux sudo redhat-rpm-config gcc python-imaging# Add wger userRUN adduser wger@@ -39,5 +39,18 @@ RUN . /home/wger/venv/bin/activate \--settings-path /home/wger/src/settings.py \--no-start-server+# Install node modules for JS linting and download the exercise images+#+# Note: it seems there are problems with node and docker, so it's necessary+# to delete the node_modules folder and install everything again+# -> https://github.com/npm/npm/issues/9863+# -> https://github.com/npm/npm/issues/13306+RUN rm -r node_modules \+ && npm install bower \+ && npm install \+ && mkdir ~/media \+ && sed -i "/^MEDIA_ROOT/c\MEDIA_ROOT='\/home\/wger\/media'" settings.py+ && python manage.py download-exercise-images+-CMD ["/bin/bash"]\ No newline at end of file+CMD ["/bin/bash"]diff --git a/extras/docker/development/Dockerfile b/extras/docker/development/Dockerfileindex 5362d1bcf..9aa176db4 100644--- a/extras/docker/development/Dockerfile+++ b/extras/docker/development/Dockerfile@@ -32,7 +32,17 @@ RUN . /home/wger/venv/bin/activate \--database-path /home/wger/db/database.sqlite \&& invoke bootstrap_wger \--settings-path /home/wger/src/settings.py \- --no-start-server \+ --no-start-server++# Install node modules for JS linting and download the exercise images+#+# Note: it seems there are problems with node and docker, so it's necessary+# to delete the node_modules folder and install everything again+# -> https://github.com/npm/npm/issues/9863+# -> https://github.com/npm/npm/issues/13306+RUN rm -r node_modules \+ && npm install bower \+ && npm install \&& mkdir ~/media \&& sed -i "/^MEDIA_ROOT/c\MEDIA_ROOT='\/home\/wger\/media'" settings.py \&& python manage.py download-exercise-images