]> git.parisson.com Git - telemeta.git/commitdiff
Merge tag 'graphers' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 7 Feb 2018 09:06:59 +0000 (10:06 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 7 Feb 2018 09:06:59 +0000 (10:06 +0100)
Fix User perm for graphers

1  2 
Dockerfile
telemeta/views/item.py

diff --cc Dockerfile
index d6a73233e2467fb6d5e3463f4ed31e155cc9ef2f,64b2abf610fe62fd25d1dd8f6016ad6ea03cc4f9..9d7d5e42938116372ed06abbb9f24962ffc16b22
@@@ -39,9 -39,8 +39,11 @@@ RUN /bin/bash /srv/app/scripts/setup_pl
  # Install Telemeta
  RUN pip install -r requirements.txt
  RUN pip install -r requirements-dev.txt --src /srv/src
 +RUN pip uninstall -y South
 +
 +RUN mkdir -p /srv/media
  
+ RUN mkdir -p /srv/media
  WORKDIR /srv/app
  EXPOSE 8000
Simple merge