From: Emilie <zawadzki@ircam.fr>
Date: Wed, 13 Jun 2018 09:55:13 +0000 (+0200)
Subject: [Docker] : build to v2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f1a51e07cf4956a0be14fa42fba8659ed53e3e42;p=mezzo.git

[Docker] : build to v2
---

diff --git a/docker-compose.yml b/docker-compose.yml
index 93b15c03..56d90ee0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -60,33 +60,10 @@ services:
         env_file:
             - 'env/prod.env'
 
-<<<<<<< HEAD
-app:
-    image: ircamweb/mezzo:latest-dev
-    command: /bin/sh bin/app.sh --runserver
-    volumes:
-        - ./app:/srv/app
-        - ./lib:/srv/lib
-        - .git:/srv/.git
-    volumes_from:
-        - var
-    expose:
-        - "8000"
-    ports:
-        - "9000:8000" 
-    links:
-        - db
-    environment:
-        - DEBUG=False
-
-nginx:
-    image: nginx
-=======
-    # nginx:
-    #     image: nginx
+    nginx:
+        image: nginx
 
 volumes:
     var:
     app:
     db:
->>>>>>> 3a4cea9d... [Docker] : docker-compose from v1 to v2
diff --git a/env/build.yml b/env/build.yml
index c7fcbf52..a1c74994 100644
--- a/env/build.yml
+++ b/env/build.yml
@@ -1,4 +1,5 @@
-
-app:
-    build: .
+version: '2'
+services:
+    app:
+        build: .