fix versions, update dockerfile

diff --git a/Dockerfile b/Dockerfile
index 12eb8cd5433e3c3a5f3886720e2f0dcee3a6d0bb..738638903a8a5d696277a2977632c36b871bd7ae 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,18 +14,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM parisson/telemeta:latest
+FROM python:2
 
 MAINTAINER Guillaume Pellerin <yomguy@parisson.com>
 
-RUN mkdir /srv/app
-RUN mkdir /srv/src
-RUN mkdir /srv/src/app
+ENV PYTHONUNBUFFERED 1
+
+RUN mkdir -p /srv/app
+RUN mkdir -p /srv/lib/
+RUN mkdir -p /srv/lib/telemeta
+
+ENV LANG fr_FR.UTF-8
+ENV LANGUAGE fr_FR:fr
+ENV LC_ALL fr_FR.UTF-8
+
+ADD . /srv/lib/teleforma
+WORKDIR /srv/lib/teleforma
 
-COPY . /srv/src/app
-WORKDIR /srv/src/app
 RUN pip install -r requirements.txt
-RUN pip install -r requirements-dev.txt --src /srv/src
+RUN pip install -r requirements-dev.txt --src /srv/lib
+
 WORKDIR /srv/app
 
 EXPOSE 8000

diff --git a/docker-compose.yml b/docker-compose.yml
index d85fdfee657df4b41d759c63346e8e3b73d6ba7c..b6290e4ded1f92ef109d29eebea0fc667206e82a 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,13 @@
 data:
-  image: debian:wheezy
+  image: debian:jessie
   volumes:
-     - ./data/media/:/srv/media
-     - ./data/static/:/srv/static
-     - ./data/backup/:/srv/backup
+     - ./var/media/:/srv/media
+     - ./var/static/:/srv/static
+     - ./var/backup/:/srv/backup
   command: "true"
 
 db:
-  image: mysql
+  image: mariadb
   environment:
     - MYSQL_ROOT_PASSWORD=mysecretpassword
     - MYSQL_DATABASE=teleforma
@@ -22,7 +22,7 @@ app:
   command: /bin/sh deploy/start_app.sh
   volumes:
     - ./app/:/srv/app
-    - ./teleforma/:/srv/src/teleforma
+    - ./teleforma/:/srv/lib/teleforma/teleforma
   volumes_from:
     - data
   ports:

diff --git a/setup.py b/setup.py
index 3bd26c2cbd88e1407c26907de2afdf8c7d2c1af3..30417cbca7293a827c912301057364d12ee3affe 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -13,8 +13,8 @@ setup(
   author_email = "yomguy@parisson.com",
   version = '1.1',
   install_requires = [
-        'django>=1.4',
-        'telemeta',
+        'django==1.4.19',
+        'telemeta==1.4.6',
         'south',
         'django-pagination',
         'django-postman',
@@ -22,7 +22,6 @@ setup(
         'django-notes',
         'django-timezones',
         'django-jqchat',
-        'django-googletools',
         'crocodoc',
         'django-registration',
         'django-extra-views',