From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 28 Mar 2018 14:33:17 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:Ircam-Web/mezzo-bin into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=19df07e8d0c9c2d86a6dca36bf3f299e9ba3c085;p=docker-django-scripts.git

Merge branch 'dev' of github.com:Ircam-Web/mezzo-bin into dev
---

19df07e8d0c9c2d86a6dca36bf3f299e9ba3c085
diff --cc prod/up.sh
index 4c4f1f7,5da0087..c433bf9
--- a/prod/up.sh
+++ b/prod/up.sh
@@@ -1,9 -1,9 +1,9 @@@
  #!/bin/sh
  
- options = ""
+ options=""
  
- if [ "$1" = "-bg" ]; then
-     options = $options "-d";
+ if [ "$1" = "-d" ]; then
+     options=$options"-d";
  fi
  
 -docker-compose -f docker-compose.yml -f env/prod.yml up $options
 +docker-compose -f docker-compose.yml -f env/prod.yml up $options