From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 29 Jan 2018 13:23:37 +0000 (+0100)
Subject: update bin, staging with on g only
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a6d834bc5c90036360f2a4232e78300f3ca9d848;p=mezzo.git

update bin, staging with on g only
---

diff --git a/bin b/bin
index f02d06ef..9d20dcaf 160000
--- a/bin
+++ b/bin
@@ -1 +1 @@
-Subproject commit f02d06efcdebccbaaafb7cfbcbb3fa967355c2a3
+Subproject commit 9d20dcaf70280a8bf87e35bb98cfe36bc9d9e2d5
diff --git a/env/stagging.yml b/env/stagging.yml
deleted file mode 100644
index 407adc0a..00000000
--- a/env/stagging.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-app:
-  build: .
-  command: /bin/sh bin/app.sh
-
-nginx:
-  image: nginx
-  ports:
-    - "8040:80"
-  volumes:
-    - ./etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
-  volumes_from:
-    - var
-  links:
-    - app
diff --git a/env/staging.yml b/env/staging.yml
new file mode 100644
index 00000000..407adc0a
--- /dev/null
+++ b/env/staging.yml
@@ -0,0 +1,15 @@
+
+app:
+  build: .
+  command: /bin/sh bin/app.sh
+
+nginx:
+  image: nginx
+  ports:
+    - "8040:80"
+  volumes:
+    - ./etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
+  volumes_from:
+    - var
+  links:
+    - app