Guard transfer-logs.sh when -e CHROME=false

Author: elgalu

CHANGELOG.md

@@ -7,8 +7,35 @@ Note image ids also change after scm-source.json has being updated which trigger
 ###### To get container versions
     docker exec grid versions
 
+## TBD_DOCKER_TAG
+ + **Changes:** https://github.com/elgalu/docker-selenium/compare/e5f198e1486630c19283d...master (TBD_DATE)
+    + Guard transfer-logs.sh when -e CHROME=false
+    + Chore: Tests minor cleanups
+    + Chore: Add /logo.png so some apps can grab it
+ + **Image tag details:**
+    + Selenium 2: TBD_SELENIUM_2_VERSION (TBD_SELENIUM_2_REVISION)
+    + Selenium 3: TBD_SELENIUM_3_VERSION (TBD_SELENIUM_3_REVISION)
+    + Chrome stable:  TBD_CHROME_STABLE
+    + Firefox for Selenium 2: TBD_FIREFOX_FOR_SEL2
+    + Firefox for Selenium 3: TBD_FIREFOX_FOR_SEL3
+    + Geckodriver: TBD_GECKO_DRIVER
+    + Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
+    + Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
+    + Timezone: TBD_TIME_ZONE
+    + FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
+    + Python: TBD_PYTHON_VERSION
+    + Tested on kernel dev host: 4.4.0-72-generic x86_64
+    + Tested on kernel CI  host: TBD_HOST_UNAME
+    + Built at dev host with: Docker version 17.03.1-ce, build c6d412e
+    + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
+    + Built at dev host with: Docker Compose version 1.11.2, build dfed245
+    + Built at CI  host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
+    + Image size: TBD_IMAGE_SIZE
+    + Digest: TBD_DIGEST
+    + Image ID: TBD_IMAGE_ID
+
 ## 3.3.1-p4
- + **Changes:** https://github.com/elgalu/docker-selenium/compare/4af973351e7d418b67e3...master (2017-04-20)
+ + **Changes:** https://github.com/elgalu/docker-selenium/compare/4af973351e7d418b67e3...e5f198e1486630c19283d (2017-04-20)
     + Upgrade Chrome major from 57 to 58.0.3029.81
     + Add node capability: tz=Europe/Berlin / custom value
     + Breaking change! New default: USE_SELENIUM="3"

CONTRIBUTING.md

@@ -12,7 +12,7 @@ For pull requests or local commits:
 
 For repository owners only:
 
-    git commit -m "Breaking change! New default: USE_SELENIUM=3"
+    git commit -m "Guard transfer-logs.sh when -e CHROME=false"
     git tag -d latest; git tag -d `cat VERSION`; git push origin :`cat VERSION`; git tag `cat VERSION` && git push --force origin tmp-`cat VERSION` && git push --tags
 
 -- Wait for Travis to pass OK

Dockerfile

@@ -321,17 +321,17 @@ RUN SHA="23925d017f8eccafb1be57c509a07df75490c83d" \
 #================
 # Font libraries
 #================
-# libfontconfig            0.400 MB
-# libfreetype6             0.400 MB
-# xfonts-cyrillic          2.271 MB
-# xfonts-scalable          2.318 MB
-# fonts-liberation         3.343 MB
-# ttf-ubuntu-font-family   4.742 MB
+# libfontconfig            ~1 MB
+# libfreetype6             ~1 MB
+# xfonts-cyrillic          ~2 MB
+# xfonts-scalable          ~2 MB
+# fonts-liberation         ~3 MB
+# ttf-ubuntu-font-family   ~5 MB
 #   Ubuntu Font Family, sans-serif typeface hinted for clarity
 # Removed packages:
-# fonts-ipafont-gothic     13.09 MB
-# xfonts-100dpi            5.939 MB
-# xfonts-75dpi             5.509 MB
+# fonts-ipafont-gothic     ~13 MB
+# xfonts-100dpi            ~6 MB
+# xfonts-75dpi             ~6 MB
 # Regarding fonts-liberation see:
 #  https://github.com/SeleniumHQ/docker-selenium/issues/383#issuecomment-278367069
 # Layer size: small: 6.898 MB (with --no-install-recommends)

README.md

@@ -15,12 +15,12 @@
 * firefox stable [last 18 versions can be found here][2.47.1m]
 * fluxbox (openbox window manager can still be found [here](https://github.com/elgalu/docker-selenium/releases/tag/3.0.1c))
 
-Selenium 2  `docker run ... -e USE_SELENIUM=2 elgalu/selenium:2`
-![docker-selenium-grid](./images/grid2_console.png)
-
 Selenium 3  `docker run ... -e USE_SELENIUM=3 elgalu/selenium:latest`
 ![docker-selenium-grid](./images/grid3_console.png)
 
+Selenium 2  `docker run ... -e USE_SELENIUM=2 elgalu/selenium:2` *no longer maintained*
+![docker-selenium-grid](./images/grid2_console.png)
+
 ### Purpose
 The purpose of this project is to have [Selenium][] running as simple and as fast as possible.
 
@@ -98,27 +98,6 @@ Shutdown immediately, no mercy
 
     docker rm -vf grid
 
-### Selenium 3
-Is now possible to choose Selenium 2 or Selenium 3 via docker run `-e USE_SELENIUM=2` (default) or `-e USE_SELENIUM=3`
-Be ready for seeing your tests failing in Firefox.
-Please google those errors first before opening an issue in this project.
-
-### e.g. Selenium 2 with FF 47.0.1
-```sh
-# capabilities['marionette'] = False
-docker run --rm -ti --name=grid2 -p 4444:24444 -p 5900:25900 \
-  -e USE_SELENIUM=2 \
-  --shm-size=1g elgalu/selenium
-```
-
-### e.g. Selenium 3 with FF 49.0.1
-```sh
-# capabilities['marionette'] = True
-docker run --rm -ti --name=grid3 -p 4444:24444 -p 5900:25900 \
-  -e USE_SELENIUM=3 \
-  --shm-size=1g elgalu/selenium
-```
-
 ### Docker Compose
 See [docker-compose](./docs/docker-compose.md)
 

VERSION

@@ -1 +1 @@
-3.3.1-p4
+3.3.1-p5

bin/entry.sh

@@ -546,6 +546,10 @@ echo "${SELENIUM_JAR_PATH}" > SELENIUM_JAR_PATH
 echo "${LOGS_DIR}" > LOGS_DIR
 echo "${FIREFOX_VERSION}" > FIREFOX_VERSION
 echo "${CHROME_VESION}" > CHROME_VESION
+echo "${CHROME}" > CHROME
+echo "${FIREFOX}" > FIREFOX
+echo "${RC_CHROME}" > RC_CHROME
+echo "${RC_FIREFOX}" > RC_FIREFOX
 env > env
 
 #------

logo.png

@@ -1,4 +1,15 @@
 #!/usr/bin/env bash
 
-# Try to retrieve Chrome Browser console logs when using this image through Zalenium
-cp /home/seluser/chrome-user-data-dir/chrome_debug.log /var/log/cont/chrome_browser.log
+if [ -z "${CHROME}" ]; then
+    if [ -f CHROME ]; then
+        export CHROME="$(cat CHROME)"
+    else
+        # fallback guard
+        export CHROME="true"
+    fi
+fi
+
+if [ "${CHROME}" == "true" ]; then
+    # Try to retrieve Chrome Browser console logs when using this image through Zalenium
+    cp /home/seluser/chrome-user-data-dir/chrome_debug.log /var/log/cont/chrome_browser.log
+fi

selenium-node-chrome/bin/transfer-logs.sh

@@ -4,8 +4,6 @@
 # set -x: print each command right before it is executed
 set -xe
 
-[ "${TRAVIS_OS_NAME}" = "osx" ] && eval "$(docker-machine env default)" || true
-
 docker --version
 docker-compose --version
 

test/before_install_build

@@ -18,8 +18,7 @@
                     help='in which browser to test')
 args = parser.parse_args()
 
-# Selenium 2 or 3?
-current_selenium = os.environ.get('USE_SELENIUM', '2')
+current_selenium = os.environ.get('USE_SELENIUM', '3')
 
 # http://selenium-python.readthedocs.org/en/latest/api.html
 if args.browser == 'chrome':
@@ -31,13 +30,6 @@
     caps = opts.to_capabilities()
 elif args.browser == 'firefox':
     caps = DesiredCapabilities.FIREFOX
-    # if current_selenium == '3':
-        # BREAKING CHANGE!
-        #  With selenium 3 & Firfox >= 48 you need to set marionette=true
-        #  when still using selenium 2 driver bindings (in selenium 3 is transparent)
-        # UPDATE! no longer needed since selenium 3.0.1 is now the stable version:
-        #  https://pypi.python.org/pypi/selenium
-        # caps['marionette'] = True
 else:
     raise ValueError("Invalid browser '%s'" % args.browser)