Fix docker-compose issue closes #141

Author: elgalu

.env

@@ -32,8 +32,8 @@ export WAIT_ALL_DONE ?= 80s
 # Number of nodes
 export chrome ?= 1
 export firefox ?= 1
-export rc_chrome ?= 1
-export rc_firefox ?= 1
+export rc_chrome ?= 0
+export rc_firefox ?= 0
 
 # To target a specific node number
 # for example to VNC into it via
@@ -59,8 +59,3 @@ export VIDEO ?= true
 # export APP ?= zalando_uk
 export APP ?= mock
 export APP_NAME ?= ${APP}
-
-# We need a fixed port number to know where to connect the selenium tests
-export PORT ?= 4444
-export HUB_PORT ?= ${PORT}
-export SELENIUM_HUB_PORT ?= ${HUB_PORT}

.travis.yml

@@ -48,7 +48,7 @@ matrix:
       services:
         - docker
       env:
-        - DOCKER_VERSION="1.13.0-rc7"
+        - DOCKER_VERSION="1.13.1-rc1"
           DOCKER_COMPOSE_VERSION="1.9.0"
     # Linux with docker:stable compose:beta/older
     - os: linux
@@ -68,7 +68,7 @@ matrix:
       services:
         - docker
       env:
-        - DOCKER_VERSION="1.13.0-rc7"
+        - DOCKER_VERSION="1.13.1-rc1"
           DOCKER_COMPOSE_VERSION="1.10.0-rc2"
     # Mac OSX: only test native docker version
     # - os: osx

CHANGELOG.md

@@ -11,6 +11,8 @@ Note image ids also change after scm-source.json has being updated which trigger
  + Date: TBD_DATE
  + Upgrade Firefox (for selenium 3) from 51.0 to 51.0.1
  + Upgrade Geckodriver minor from 0.13.0 to 0.14.0
+ + Fix docker-compose issue closes #141
+ + Remove Selenium RC from tests are the feature is not being used
  + Image tag details:
   + Selenium 2: TBD_SELENIUM_2_VERSION (TBD_SELENIUM_2_REVISION)
   + Selenium 3: 3.0.1 (1969d75)

CONTRIBUTING.md

@@ -12,7 +12,7 @@ For pull requests or local commits:
 
 For repository owners only:
 
-    git commit -m "Upgrade Geckodriver minor from 0.13.0 to 0.14.0"
+    git commit -m "Fix docker-compose issue closes #141"
     git tag -d latest && git tag `cat VERSION` && git push origin tmp-`cat VERSION` && git push --tags
 
 -- Wait for Travis to pass OK

Makefile

@@ -9,7 +9,7 @@
 #  make setup compose chrome=3 firefox=5 see browser=firefox node=5
 #
 # Contributing
-#  export TESTING_MAKE=true proj=leo PORT=5555 nodes=2
+#  export TESTING_MAKE=true proj=leo nodes=2
 #  make chrome=2 firefox=2 && make seeall dock
 ifeq ($(OS),Windows_NT)
 $(error Windows is not currently supported)
@@ -146,14 +146,6 @@ seech:
 seeff:
 	@$(MAKE) -s see browser=firefox
 
-# Shortcut to VNC into RC Firefox
-seercff:
-	@$(MAKE) -s see browser=rc_firefox
-
-# Shortcut to VNC into RC Chrome
-seercch:
-	@$(MAKE) -s see browser=rc_chrome
-
 env:
 	env
 
@@ -174,8 +166,6 @@ down:
 	@if [ "${VIDEO}" = "true" ]; then \
 	  $(MAKE) -s stop_videos_chrome ; \
 	  $(MAKE) -s stop_videos_firefox ; \
-	  $(MAKE) -s stop_videos_rc_chrome ; \
-	  $(MAKE) -s stop_videos_rc_firefox ; \
 	fi
 	docker-compose -f ${COMPOSE_FILE} -p ${COMPOSE_PROJ_NAME} down \
 	  --remove-orphans
@@ -192,20 +182,14 @@ stop_videos_chrome:
 stop_videos_firefox:
 	@$(MAKE) -s stop_videos browser=firefox tot_nodes=${firefox}
 
-stop_videos_rc_chrome:
-	@$(MAKE) -s stop_videos browser=rc_chrome tot_nodes=${rc_chrome}
-
-stop_videos_rc_firefox:
-	@$(MAKE) -s stop_videos browser=rc_firefox tot_nodes=${rc_firefox}
-
 scale:
 	docker-compose -f ${COMPOSE_FILE} -p ${COMPOSE_PROJ_NAME} scale \
-	  ${APP_NAME}=1 hub=1 chrome=${chrome} firefox=${firefox} rc_chrome=${rc_chrome} rc_firefox=${rc_firefox}
+	  ${APP_NAME}=1 hub=1 chrome=${chrome} firefox=${firefox}
 	@$(MAKE) -s wait chrome=${chrome} firefox=${firefox}
 
 compose: basic_reqs cleanup
 	docker-compose -f ${COMPOSE_FILE} -p ${COMPOSE_PROJ_NAME} up -d
-	@$(MAKE) -s scale chrome=${chrome} firefox=${firefox} rc_chrome=${rc_chrome} rc_firefox=${rc_firefox}
+	@$(MAKE) -s scale chrome=${chrome} firefox=${firefox}
 
 wait:
 	./mk/wait.sh
@@ -232,35 +216,21 @@ gather_videos_chrome:
 gather_videos_firefox:
 	@$(MAKE) -s gather_videos browser=firefox tot_nodes=${firefox}
 
-gather_videos_rc_chrome:
-	@$(MAKE) -s gather_videos browser=rc_chrome tot_nodes=${rc_chrome}
-
-gather_videos_rc_firefox:
-	@$(MAKE) -s gather_videos browser=rc_firefox tot_nodes=${rc_firefox}
-
 # Gather video artifacts
-videos: gather_videos_chrome gather_videos_firefox gather_videos_rc_chrome gather_videos_rc_firefox
+videos: gather_videos_chrome gather_videos_firefox
 
 # VNC open all. As of now only 4 are supported
 seeall: check_vncviewer
 	@$(MAKE) -s see browser=chrome node=1
 	@sleep 0.3
 	@$(MAKE) -s see browser=firefox node=1
-	@sleep 0.4
-	@$(MAKE) -s see browser=rc_chrome node=1
-	@sleep 0.3
-	@$(MAKE) -s see browser=rc_firefox node=1
 
 # Move them all. As of now only 4 are supported
 dock: check_wmctrl
 	@sleep 0.2 #TODO Make active wait: http://stackoverflow.com/a/19441380/511069
 	@$(MAKE) -s move browser=chrome node=1
 	@sleep 0.2 #TODO Make active wait
 	@$(MAKE) -s move browser=firefox node=1
-	@sleep 0.2 #TODO Make active wait
-	@$(MAKE) -s move browser=rc_chrome node=1
-	@sleep 0.2 #TODO Make active wait
-	@$(MAKE) -s move browser=rc_firefox node=1
 
 # Run self tests
 test:
@@ -288,8 +258,6 @@ test:
 	scale \
 	seeff \
 	seech \
-	seercff \
-	seercch \
 	compose \
 	wait \
 	down \

README.md

@@ -45,8 +45,8 @@ This project is normally tested in the last version of Docker and docker-compose
 To figure out the currently used specific versions it surely works on,
 see file [.travis.yml](./.travis.yml) example values:
 
-    docker --version         #=> 1.11.2
-    docker-compose --version #=> 1.7.1
+    docker --version         #=> 1.13.0
+    docker-compose --version #=> 1.10.0
 
 If you need to use docker-machine to run docker
 (like for example on a Mac before the Docker native version 1.12),
@@ -122,11 +122,15 @@ See [docker-compose](./docs/docker-compose.md)
 See [jenkins](./docs/jenkins.md)
 
 ### Parallel
-This image is designed to run one test on each docker container but if you still want to run multiple tests in parallel you can still do so, there are some ways to do this:
+We now have a better suited product for this use case, is called [Zalenium][]
+
+This image is designed to run one test on each docker container but if you still want to run multiple tests in parallel you can still do so with [Zalenium][]
+
+If you want to limit yourself to this project, you still can. There are some ways to do it:
 
 1. The recommended way is via [docker-compose](./docs/docker-compose.md) and you should replace `mock` with your web service under test within the [docker-compose.yml][] file.
 
-        export SELENIUM_HUB_PORT=4444 VNC_FROM_PORT=40650 VNC_TO_PORT=40700 VIDEO=false
+        docker-compose -p grid up --force-recreate
         docker-compose -p grid scale mock=1 hub=1 chrome=3 firefox=3
 
 1. The _(not recommended)_ way is by increasing `MAX_INSTANCES` and `MAX_SESSIONS` which now [defaults](https://github.com/elgalu/docker-selenium/blob/2.53.1a/Dockerfile#L967) to 1.
@@ -287,7 +291,7 @@ In Protrator
 However this is now the default of this image, see `CHROME_ARGS="--no-sandbox"` in the Dockerfile so don't be surprised to see the "Stability and security will suffer" banner when opening Chrome inside the container.
 
 ## Cloud Testing Platforms
-We now have a better suited product for this use case, is called [Zalenium](https://github.com/zalando/zalenium)
+We now have a better suited product for this use case, is called [Zalenium][]
 
 ## Additional Uses
 
@@ -451,3 +455,4 @@ See [LICENSE.md](./LICENSE.md)
 [BrowserStack]: https://www.browserstack.com/automate
 [xvfb-electron]: http://electron.atom.io/docs/tutorial/testing-on-headless-ci
 [docker-compose.yml]: ./docker-compose.yml
+[Zalenium]: https://github.com/zalando/zalenium

docker-compose-host.yml

@@ -1,11 +1,11 @@
-version: '2'
+version: '3'
 
 services:
   hub:
     image: elgalu/selenium
     network_mode: host
     environment:
-      - SELENIUM_HUB_PORT
+      - SELENIUM_HUB_PORT=${SELENIUM_HUB_PORT-4444}
       - PICK_ALL_RANDOM_PORTS=true
       - GRID=true
       - CHROME=false
@@ -18,7 +18,7 @@ services:
     network_mode: host
     shm_size: 1g
     environment:
-      - SELENIUM_HUB_PORT
+      - SELENIUM_HUB_PORT=${SELENIUM_HUB_PORT-4444}
       - PICK_ALL_RANDOM_PORTS=true
       - GRID=false
       - CHROME=true
@@ -30,7 +30,7 @@ services:
     image: elgalu/selenium
     network_mode: host
     environment:
-      - SELENIUM_HUB_PORT
+      - SELENIUM_HUB_PORT=${SELENIUM_HUB_PORT-4444}
       - PICK_ALL_RANDOM_PORTS=true
       - GRID=false
       - CHROME=false
@@ -43,7 +43,7 @@ services:
     network_mode: host
     shm_size: 1g
     environment:
-      - SELENIUM_HUB_PORT
+      - SELENIUM_HUB_PORT=${SELENIUM_HUB_PORT-4444}
       - PICK_ALL_RANDOM_PORTS=true
       - GRID=false
       - CHROME=false
@@ -55,7 +55,7 @@ services:
     image: elgalu/selenium
     network_mode: host
     environment:
-      - SELENIUM_HUB_PORT
+      - SELENIUM_HUB_PORT=${SELENIUM_HUB_PORT-4444}
       - PICK_ALL_RANDOM_PORTS=true
       - GRID=false
       - CHROME=false