From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 25 Sep 2015 11:04:02 +0000 (+0200)
Subject: fix sandbox start
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d8435d334d65ef134a0e4f75209a1f374d47cff2;p=diggersdigest.git

fix sandbox start
---

diff --git a/Dockerfile b/Dockerfile
index 0bb171a..9bf9d62 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,5 +20,3 @@ RUN pip install -r requirements.txt
 
 ADD requirements-dev.txt /opt/app/
 RUN pip install -r requirements-dev.txt --src /opt/src
-
-ADD app /opt/app/
diff --git a/app/deploy/start_app.sh b/app/deploy/start_app.sh
index 1606dfb..afa1a68 100644
--- a/app/deploy/start_app.sh
+++ b/app/deploy/start_app.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 # paths
-root='/opt'
-sandbox=$root'/app/app'
-manage=$sandbox'/manage.py'
-wsgi=$sandbox'/wsgi.py'
-static=$root'/static/'
-media=$root'/media/'
+root='/opt/'
+sandbox=$root'app/'
+manage=$sandbox'manage.py'
+wsgi=$sandbox'wsgi.py'
+static=$root'static/'
+media=$root'media/'
 
 # waiting for other services
 sh $sandbox/deploy/wait.sh
diff --git a/app/diggersdigest/settings.py b/app/diggersdigest/settings.py
index 3baa961..b0bc748 100644
--- a/app/diggersdigest/settings.py
+++ b/app/diggersdigest/settings.py
@@ -75,7 +75,7 @@ EXTRA_MODEL_FIELDS = (
         "cartridge.shop.models.Order.callback_uuid",
         "django.db.models.CharField",
         (),
-        {"blank" : False, "max_length" : 36, 'default': 0},
+        {"blank" : False, "max_length" : 36, 'default': ""},
      ),
      # ...
      #     # Example of adding a field to *all* of Mezzanine's content types:
diff --git a/app/records/models.py b/app/records/models.py
index 8ca7ea0..aaf8778 100644
--- a/app/records/models.py
+++ b/app/records/models.py
@@ -240,7 +240,7 @@ class Record(models.Model):
 
     title = models.CharField(max_length=128, blank=True)
     artist = models.ForeignKey(Artist, verbose_name=_('artist'), related_name='records_artists', blank=True, null=True, on_delete=models.SET_NULL)
-    performers = models.ManyToManyField(Artist, verbose_name=_('performers'), related_name='records_performers', blank=True, null=True)
+    performers = models.ManyToManyField(Artist, verbose_name=_('performers'), related_name='records_performers', blank=True)
     record_status = models.IntegerField(_('record status'), choices=NOVELTY_CHOICES, default=NEW)
     label = models.ForeignKey(Label, verbose_name=_('label'), related_name='records', blank=True, null=True, on_delete=models.SET_NULL)
     # reference_label = models.CharField(_('reference'), max_length=128, blank=True)
@@ -310,7 +310,7 @@ def payment_complete(sender, **kwargs):
             try:
                 order = Order.objects.get(
                     transaction_id=ipn_obj.invoice)
-                #order = Order.objects.get(key=s_key)
+                # order = Order.objects.get(key=s_key)
                 for field in order.session_fields:
                     if field in session:
                         del session[field]
diff --git a/docker-compose.yml b/docker-compose.yml
index 8253149..64bfcde 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,10 +17,9 @@ db:
 
 app:
   build: .
-  command: /bin/sh app/deploy/start_app.sh
+  command: /bin/sh deploy/start_app.sh
   volumes:
-    - ./app/:/opt/app/app
-    - ./src/:/opt/src
+    - app/:/opt/app
   volumes_from:
     - media
   ports: