Goto compose v2 everywhere

diff --git a/docker-compose.yml b/docker-compose.yml
index 7db2252af0149eff8dfcaee301cb8bdc8ca1e0ac..41b6bfb118f3bdd129328569728c61591d7bfdd1 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,6 +34,7 @@ services:
             - ./doc:/srv/doc
             - /srv/bower
         command: "true"
+
     db:
         image: postgres:9.5
         volumes:

diff --git a/env/prod.yml b/env/prod.yml
index b5b4e9a23653a7786139f9ab6044262b2002e294..361adb9d5f3197ffc2178e2f55a1fab76c471854 100644 (file)
--- a/env/prod.yml
+++ b/env/prod.yml
@@ -1,4 +1,3 @@
-
 version: '2'
 services:
     app:

diff --git a/env/selenium.yml b/env/selenium.yml
index 57829abf3edeed5a29ba64f56a04835da7097871..3b9dc821f3769582a34003b432476415b8df597b 100644 (file)
--- a/env/selenium.yml
+++ b/env/selenium.yml
@@ -1,32 +1,35 @@
 # To execute this docker-compose yml file use docker-compose -f <file_name> up
 # Add the "-d" flag at the end for deattached execution
-firefox:
-  image: selenium/node-firefox:3.11.0-dysprosium
-  volumes:
-    - /dev/shm:/dev/shm
-  links:
-    - hub
-  environment:
-    HUB_HOST: hub
-    HUB_PORT: '4444'
 
-chrome:
-  image: selenium/node-chrome:3.11.0-dysprosium
-  volumes:
-    - /dev/shm:/dev/shm
-  links:
-    - hub
-  environment:
-    HUB_HOST: hub
-    HUB_PORT: '4444'
+version: '2'
+services:
+    firefox:
+        image: selenium/node-firefox:3.11.0-dysprosium
+        volumes:
+            - /dev/shm:/dev/shm
+        depends_on:
+            - hub
+        environment:
+            HUB_HOST: hub
+            HUB_PORT: '4444'
 
-hub:
-  image: selenium/hub:3.11.0-dysprosium
-  ports:
-    - "4444:4444"
-  expose:
-    - "4444"
+    chrome:
+        image: selenium/node-chrome:3.11.0-dysprosium
+        volumes:
+            - /dev/shm:/dev/shm
+        depends_on:
+            - hub
+        environment:
+            HUB_HOST: hub
+            HUB_PORT: '4444'
 
-app:
-  links:
-    - hub
\ No newline at end of file
+    hub:
+        image: selenium/hub:3.11.0-dysprosium
+        ports:
+            - "4444:4444"
+        expose:
+            - "4444"
+
+    app:
+        depends_on:
+            - hub
\ No newline at end of file

diff --git a/env/staging.yml b/env/staging.yml
index 39b1c7ea7215833b9e110ebaaa05254daee6aeb6..3bc41416065f6ca701eb140c61610c8ed2be2ebb 100644 (file)
--- a/env/staging.yml
+++ b/env/staging.yml
@@ -1,5 +1,6 @@
-
-app:
-    command: /bin/sh bin/app.sh
-    ports:
-        - "8040:8000"
+version: '2'
+services:
+  app:
+      command: /bin/sh bin/app.sh
+      ports:
+          - "8040:8000"