Fix docker-compose examples for #192

Author: elgalu

docker-compose-scales.yml

@@ -0,0 +1,58 @@
+# The purpose of this -scales example is to run 1 hub, N chromes, N firefox
+#
+# Usage:
+#  docker-compose -f docker-compose-scales.yml -p grid up --force-recreate
+# How to scale it:
+#  docker-compose -f docker-compose-scales.yml -p grid scale hub=1 chrome=2 firefox=1
+version: '3'
+
+services:
+  hub:
+    image: elgalu/selenium
+    ports:
+      - 4444:4444
+    volumes:
+      - /dev/shm:/dev/shm
+    privileged: true
+    environment:
+      - SELENIUM_HUB_HOST=hub
+      - SELENIUM_HUB_PORT=4444
+      - GRID=true
+      - CHROME=false
+      - FIREFOX=false
+
+  chrome:
+    image: elgalu/selenium
+    depends_on:
+      - hub
+    volumes:
+      - /dev/shm:/dev/shm
+    privileged: true
+    environment:
+      - SELENIUM_HUB_HOST=hub
+      - SELENIUM_HUB_PORT=4444
+      - SELENIUM_NODE_HOST={{CONTAINER_IP}}
+      - SCREEN_WIDTH=1300
+      - SCREEN_HEIGHT=999
+      - VIDEO=false
+      - GRID=false
+      - CHROME=true
+      - FIREFOX=false
+
+  firefox:
+    image: elgalu/selenium
+    depends_on:
+      - hub
+    volumes:
+      - /dev/shm:/dev/shm
+    privileged: true
+    environment:
+      - SELENIUM_HUB_HOST=hub
+      - SELENIUM_HUB_PORT=4444
+      - SELENIUM_NODE_HOST={{CONTAINER_IP}}
+      - SCREEN_WIDTH=1300
+      - SCREEN_HEIGHT=999
+      - VIDEO=false
+      - GRID=false
+      - CHROME=false
+      - FIREFOX=true

docker-compose-tests.yml

@@ -1,3 +1,5 @@
+# The purpose of this -test example is for the e2e tests of this project
+#
 # Usage:
 #  docker-compose -p grid up --force-recreate
 #  docker-compose -p grid scale mock=1 hub=1 chrome=3 firefox=3

docker-compose.yml

@@ -1,21 +1,18 @@
+# The purpose of this `docker-compose.yml` example is to run 1 hub, 1 chrome, 1 firefox
+# i.e. this example doesn't scale, but there is another file for that: docker-compose-scales.yml
+# i.e. this example doesn't support `docker-compose scale`
+#
+# If you try to scale this one you will get `Bind for 0.0.0.0:6080 failed: port is already allocated`
+#
 # Usage:
 #  docker-compose -p grid up --force-recreate
-#  docker-compose -p grid scale mock=1 hub=1 chrome=3 firefox=3
-version: '2.1'
+version: '3'
 
 services:
   hub:
     image: elgalu/selenium
     ports:
-      # Note 24444 is the default SELENIUM_HUB_PORT inside the container
-      #  and  4444 will be mapped into your host for easy access.
       - 4444:4444
-      # We need a fixed port range to expose VNC
-      # due to a bug in Docker for Mac beta (1.12)
-      # https://forums.docker.com/t/docker-for-mac-beta-not-forwarding-ports/8658/6
-      - ${VNC_FROM_PORT-40650}-${VNC_TO_PORT-40700}:${VNC_FROM_PORT-40650}-${VNC_TO_PORT-40700}
-      # e.g. (hard-coded)
-      # - 40650-40700:40650-40700
     volumes:
       - /dev/shm:/dev/shm
     privileged: true
@@ -25,7 +22,6 @@ services:
       - GRID=true
       - CHROME=false
       - FIREFOX=false
-      - MOCK_SERVER_HOST=mock
 
   chrome:
     image: elgalu/selenium
@@ -35,6 +31,7 @@ services:
       # VNC: See what's going on by connecting your VNC client to 0.0.0.0:5900
       - 5900:25900
       # noVNC: See what's going on by hitting http://0.0.0.0:6080 in your browser
+      #        Important: http://127.0.0.1:6080 works but http://localhost:6080 doesn't
       - 6080:26080
     volumes:
       - /dev/shm:/dev/shm
@@ -44,11 +41,9 @@ services:
       - SELENIUM_HUB_HOST=hub
       - SELENIUM_HUB_PORT=4444
       - SELENIUM_NODE_HOST={{CONTAINER_IP}}
-      - VNC_FROM_PORT=${VNC_FROM_PORT-40650}
-      - VNC_TO_PORT=${VNC_TO_PORT-40700}
       - SCREEN_WIDTH=1300
       - SCREEN_HEIGHT=999
-      - VIDEO=${VIDEO-false}
+      - VIDEO=false
       - GRID=false
       - CHROME=true
       - FIREFOX=false
@@ -70,19 +65,9 @@ services:
       - SELENIUM_HUB_HOST=hub
       - SELENIUM_HUB_PORT=4444
       - SELENIUM_NODE_HOST={{CONTAINER_IP}}
-      - VNC_FROM_PORT=${VNC_FROM_PORT-40650}
-      - VNC_TO_PORT=${VNC_TO_PORT-40700}
       - SCREEN_WIDTH=1300
       - SCREEN_HEIGHT=999
-      - VIDEO=${VIDEO-false}
+      - VIDEO=false
       - GRID=false
       - CHROME=false
       - FIREFOX=true
-
-  mock:
-    image: elgalu/google_adwords_mock
-    depends_on:
-      - hub
-    tty: true
-    environment:
-      - MOCK_SERVER_PORT=8280