From 8d185ffa5ab42f3c626679a3119468b103059148 Mon Sep 17 00:00:00 2001
From: Fabien Bourgeois <fabien@yaltik.com>
Date: Mon, 3 Oct 2016 15:53:02 +0200
Subject: [PATCH] [IMP]Docker compose with build and v2

---
 framasoft/mypads.yml | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/framasoft/mypads.yml b/framasoft/mypads.yml
index fe5eade..50eef93 100644
--- a/framasoft/mypads.yml
+++ b/framasoft/mypads.yml
@@ -1,18 +1,20 @@
-framapg:
-  image: framapg
-  environment:
-    POSTGRES_USER: mypads
-    POSTGRES_PASSWORD: 1njohpqmcZ+mimtyMkn5
-  # cap_add:
-  #   - SYS_ADMIN
-  ports:
-    - "5432:5432"
-  volumes:
-    - /home/fabien/tmp/francesca/francesca:/var/lib/postgresql/data
+version: '2'
+services:
+  framapg:
+    image: framapg
+    environment:
+      POSTGRES_USER: mypads
+      POSTGRES_PASSWORD: 1njohpqmcZ+mimtyMkn5
+    # cap_add:
+    #   - SYS_ADMIN
+    ports:
+      - "5432:5432"
+    volumes:
+      - /home/fabien/tmp/francesca/francesca:/var/lib/postgresql/data
 
-frametherpad:
-  image: frametherpad
-  ports:
-    - "9001:9001"
-  links:
-    - framapg:framapg
+  frametherpad:
+    image: frametherpad
+    ports:
+      - "9001:9001"
+    links:
+      - framapg:framapg