From: Thomas Fillon <thomas@parisson.com>
Date: Wed, 5 Jul 2017 19:33:47 +0000 (+0200)
Subject: Merge branch 'dev' into release/1.7
X-Git-Tag: 1.7.0~2^2~21^2^2~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=53620226e892299371b59e9a66cedfd79e78a093;p=telemeta.git

Merge branch 'dev' into release/1.7

Conflicts:
	Dockerfile
---

53620226e892299371b59e9a66cedfd79e78a093
diff --cc Dockerfile
index 46cd53b2,5480650d..a64c0ba0
--- a/Dockerfile
+++ b/Dockerfile
@@@ -37,5 -35,9 +33,10 @@@ COPY ./app/scripts/setup_plugins.sh /sr
  COPY ./lib/ /srv/src/plugins/
  RUN /bin/bash /srv/app/scripts/setup_plugins.sh
  
+ # Install Telemeta
+ RUN pip install -r requirements.txt
+ RUN pip install -r requirements-dev.txt --src /srv/src
++RUN pip uninstall -y South
+ 
  WORKDIR /srv/app
  EXPOSE 8000