add libmysqlclient dep, fix compose links, fix unique charfield length

diff --git a/Dockerfile b/Dockerfile
index 5d5b91c15dedfabb89c9ab78fdb0c66cb8ce1352..d4fd4556be46f71e2443ec6e046fc5fee633d4f1 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,12 +18,11 @@ FROM debian:wheezy
 MAINTAINER Guillaume Pellerin <yomguy@parisson.com>, Thomas fillon <thomas@parisson.com>
 
 # install confs, keys and deps
-RUN apt-key adv --keyserver pgp.mit.edu --recv-key E3298399DF14BB7C && \
-    echo 'deb http://http.debian.net/debian wheezy-backports main contrib non-free' > /etc/apt/sources.list.d/wheezy-backports.list && \
+RUN echo 'deb http://http.debian.net/debian wheezy-backports main contrib non-free' > /etc/apt/sources.list.d/wheezy-backports.list && \
     echo 'deb http://debian.parisson.com/debian/ wheezy main' > /etc/apt/sources.list.d/parisson.list && \
     apt-get update && \
     apt-get -y --force-yes -t wheezy-backports dist-upgrade  && \
-    apt-get install -y --force-yes python-gst0.10 gstreamer0.10-plugins-good gstreamer0.10-gnonlin gstreamer0.10-plugins-ugly gstreamer0.10-plugins-bad gstreamer0.10-alsa vamp-examples && \
+    apt-get install -y --force-yes python-gst0.10 gstreamer0.10-plugins-good gstreamer0.10-gnonlin gstreamer0.10-plugins-ugly gstreamer0.10-plugins-bad gstreamer0.10-alsa vamp-examples libmysqlclient-dev && \
     apt-get install -y --force-yes -t wheezy-backports python-yaafe && \
     apt-get install -y --force-yes wget bzip2 build-essential && \
     apt-get clean

diff --git a/docker-compose-mysql.yml b/docker-compose-mysql.yml
index c4a5b769a2b3b2740cc2534c5b8f700506a9496a..816f7e5d1da6220b0c5ac2902b277abc86e55397 100644 (file)
--- a/docker-compose-mysql.yml
+++ b/docker-compose-mysql.yml
@@ -93,6 +93,7 @@ worker:
   links:
     - rabbitmq
     - app
+    - db
 
 nginx:
   image: nginx

diff --git a/examples/sandbox/update_schema.sh b/examples/sandbox/update_schema.sh
index 82d28e9e4aea79972f6e744e897c94f3894ba6c2..bfe47d4a9902653a5653cb77ae3f4267acc175c2 100755 (executable)
--- a/examples/sandbox/update_schema.sh
+++ b/examples/sandbox/update_schema.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-./manage.py schemamigration timeside --auto
-./manage.py migrate timeside
+./manage.py schemamigration timeside.server--auto
+./manage.py migrate timeside.server
 

diff --git a/timeside/server/models.py b/timeside/server/models.py
index d8ced2cc91a09d649d52b7b86cb666674c08089d..2f577a2ec7994b7d13521ca2f8ec13768c564342 100644 (file)
--- a/timeside/server/models.py
+++ b/timeside/server/models.py
@@ -106,7 +106,7 @@ class BaseResource(models.Model):
     date_added = models.DateTimeField(_('date added'), auto_now_add=True)
     date_modified = models.DateTimeField(_('date modified'), auto_now=True,
                                          null=True)
-    uuid = models.CharField(_('uuid'), unique=True, blank=True, max_length=512)
+    uuid = models.CharField(_('uuid'), unique=True, blank=True, max_length=255)
 
     class Meta(MetaCore):
         abstract = True