From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 19 Mar 2015 11:44:42 +0000 (+0100)
Subject: fix db, add netcat
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e128edcb8aa387e4a480d108bf89e32abe36c96a;p=timeside.git

fix db, add netcat
---

diff --git a/Dockerfile b/Dockerfile
index 9b76fd8..79ebebb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,9 +22,9 @@ RUN echo 'deb http://http.debian.net/debian wheezy-backports main contrib non-fr
     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 libmysqlclient-dev && \
+    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 -t wheezy-backports python-yaafe && \
-    apt-get install -y --force-yes wget bzip2 build-essential && \
+    apt-get install -y --force-yes wget bzip2 build-essential netcat libmysqlclient-dev && \
     apt-get clean
 
 # Install conda in /opt/miniconda
diff --git a/examples/deploy/start_app.sh b/examples/deploy/start_app.sh
index 94ff7c1..3b6528b 100644
--- a/examples/deploy/start_app.sh
+++ b/examples/deploy/start_app.sh
@@ -2,7 +2,7 @@
 
 # paths
 app='/opt/TimeSide/'
-static=$app'timeside/static/'
+static=$app'timeside/player/static/'
 sandbox='/home/sandbox/'
 manage=$sandbox'manage.py'
 wsgi=$sandbox'wsgi.py'
diff --git a/examples/sandbox/settings.py b/examples/sandbox/settings.py
index e3f784c..f53c16a 100644
--- a/examples/sandbox/settings.py
+++ b/examples/sandbox/settings.py
@@ -27,7 +27,7 @@ DATABASES = {
         'ENGINE': 'django.db.backends.mysql',  # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
         'USER': 'root',      # Not used with sqlite3.
         'PASSWORD': 'mysecretpassword',  # Not used with sqlite3.
-        'NAME': 'timeside',
+        'NAME': 'sandbox',
         'HOST': 'db',      # Set to empty string for localhost. Not used with sqlite3.
         'PORT': '3306',      # Set to empty string for default. Not used with sqlite3.
     }
@@ -179,7 +179,6 @@ LOGGING = {
 REST_FRAMEWORK = {
 }
 
-
 # replace rabbitmq by localhost if you start your app outside docker-compose
 BROKER_URL = 'amqp://guest:guest@rabbitmq//'