Remove geckodriver as is not being used yet

Author: elgalu

.travis.yml

@@ -48,7 +48,7 @@ matrix:
       services:
         - docker
       env:
-        - DOCKER_VERSION="1.12.0"
+        - DOCKER_VERSION="1.12.2-rc1"
           DOCKER_COMPOSE_VERSION="1.8.0"
     # Linux with docker:stable compose:beta/older
     - os: linux
@@ -66,7 +66,7 @@ matrix:
       services:
         - docker
       env:
-        - DOCKER_VERSION="1.12.0"
+        - DOCKER_VERSION="1.12.2-rc1"
           DOCKER_COMPOSE_VERSION="1.8.1"
     # Mac OSX: only test native docker version
     - os: osx

CHANGELOG.md

@@ -7,12 +7,36 @@ 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
+ + Date: TBD_DATE
+ + Remove geckodriver as is not being used yet
+ + Image tag details:
+  + Selenium: vTBD_SELENIUM_VERSION (TBD_SELENIUM_REVISION)
+  + Chrome stable:  TBD_CHROME_STABLE
+  + Firefox stable: TBD_FIREFOX_STABLE
+  + 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
+  + Sauce Connect TBD_SAUCE_CONNECT_VERS, build TBD_SAUCE_CONNECT_BUILD TBD_SAUCE_CONNECT_REVISION
+  + BrowserStack Local version TBD_BROWSER_STACK_VERSION
+  + Tested on kernel dev host: 4.4.0-38-generic x86_64
+  + Tested on kernel CI  host: TBD_HOST_UNAME
+  + Built at dev host with: Docker version 1.12.1, build 23cf638
+  + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
+  + Built at dev host with: Docker Compose version 1.8.1, build 878cff1
+  + 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
+
 ## 2.53.1y
  + Date: 2016-09-27
  + Set chromedriver --log-path='/var/log/cont/chromedriver.log'
  + Add geckodriver for Firefox >= 48 (future releases)
  + Upgrade Ubuntu xenial to 20160923
- + Perhaps fixed DBUS mistery with at entry.sh
+ + Perhaps fixed DBUS mistery. See `entry.sh`
  + Client side: docker-compose from 1.8.0 to 1.8.1
  + Image tag details:
   + Selenium: v2.53.1 (a36b8b1)

CONTRIBUTING.md

@@ -6,18 +6,18 @@ For pull requests or local commits:
     time (./test/bef && ./test/install && ./test/script_start && ./test/script_end) ; beep
     docker exec grid versions && ./test/after_script && travis lint
     open ./images/grid_console.png && open ./videos/chrome/*.mkv
-    git checkout -b tmp-2.53.1y && git checkout ./images/grid_console.png
+    git checkout -b tmp-2.53.1z && git checkout ./images/grid_console.png
     #git add ... git commit ... git push ... open pull request
 
 For repository owners only:
 
-    git commit -m "geckodriver, Ubuntu 20160923, chromedriver.log, DBUS magic"
-    git tag -d latest && git tag 2.53.1y && git push origin tmp-2.53.1y && git push --tags
+    git commit -m "Remove geckodriver as is not being used yet"
+    git tag -d latest && git tag 2.53.1z && git push origin tmp-2.53.1z && git push --tags
 
 -- Wait for Travis to pass OK
 -- Make sure changes got merged into master by elgalubot
 
-    git checkout master && git pull && git branch -d tmp-2.53.1y && git push origin --delete tmp-2.53.1y
+    git checkout master && git pull && git branch -d tmp-2.53.1z && git push origin --delete tmp-2.53.1z
 
 -- Re-add TBD_* section in CHANGELOG.md starting with TBD_DOCKER_TAG
 -- If Chrome version changed upload:
@@ -35,9 +35,9 @@ Keep certain bins if chrome version changed for example:
 ## Retry
 Failed in Travis? retry
 
-    git tag -d 2.53.1y && git push origin :2.53.1y
+    git tag -d 2.53.1z && git push origin :2.53.1z
     #git add ...
-    git commit --amend && git tag 2.53.1y && git push --force origin tmp-2.53.1y && git push --tags
+    git commit --amend && git tag 2.53.1z && git push --force origin tmp-2.53.1z && git push --tags
 
 ## Docker push from Travis CI
 Travis [steps](https://docs.travis-ci.com/user/docker/#Pushing-a-Docker-Image-to-a-Registry) involve `docker login` and docker credentials encryptions.

Dockerfile

@@ -123,6 +123,10 @@ RUN echo "Setting time zone to '${TZ}'" \
 #  https://github.com/SeleniumHQ/docker-selenium/issues/14#issuecomment-67414070
 # RUN apt-get -qqy update \
 #   && apt-get -qqy install \
+#     software-properties-common \
+#   && add-apt-repository ppa:openjdk-r/ppa \
+#   && apt-get -qqy update \
+#   && apt-get -qqy install \
 #     openjdk-7-jre-headless \
 #   && sed -i 's/securerandom.source=file:\/dev\/urandom/securerandom.source=file:\/dev\/.\/urandom/g' \
 #        /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/security/java.security \
@@ -725,19 +729,19 @@ RUN mkdir -p ${SEL_HOME} && cd ${SEL_HOME} \
 #============
 # GeckoDriver
 #============
-ENV GECKOD_VER="0.10.0" \
-    GECKOD_URL="https://github.com/mozilla/geckodriver/releases/download"
-RUN wget --no-verbose -O /tmp/geckodriver.tar.gz \
-     "${GECKOD_URL}/v${GECKOD_VER}/geckodriver-v${GECKOD_VER}-linux64.tar.gz" \
-  && rm -rf /opt/geckodriver* \
-  && tar -C /opt -xvzf /tmp/geckodriver.tar.gz \
-  && mv /opt/geckodriver /usr/bin/geckodriver \
-  && chmod +x /usr/bin/geckodriver \
-  && ln -fs /usr/bin/geckodriver /opt/geckodriver \
-  && ln -fs /usr/bin/geckodriver ${FF_DEST}/geckodriver \
-  && ln -fs /usr/bin/geckodriver /usr/bin/wires \
-  && ln -fs /usr/bin/geckodriver ${FF_DEST}/wires \
-  && rm /tmp/geckodriver.tar.gz
+# ENV GECKOD_VER="0.10.0" \
+#     GECKOD_URL="https://github.com/mozilla/geckodriver/releases/download"
+# RUN wget --no-verbose -O /tmp/geckodriver.tar.gz \
+#      "${GECKOD_URL}/v${GECKOD_VER}/geckodriver-v${GECKOD_VER}-linux64.tar.gz" \
+#   && rm -rf /opt/geckodriver* \
+#   && tar -C /opt -xvzf /tmp/geckodriver.tar.gz \
+#   && mv /opt/geckodriver /usr/bin/geckodriver \
+#   && chmod +x /usr/bin/geckodriver \
+#   && ln -fs /usr/bin/geckodriver /opt/geckodriver \
+#   && ln -fs /usr/bin/geckodriver /usr/bin/wires \
+#   && ln -fs /usr/bin/geckodriver ${FF_DEST}/geckodriver \
+#   && ln -fs /usr/bin/geckodriver ${FF_DEST}/wires \
+#   && rm /tmp/geckodriver.tar.gz
 
   # && rm -rf ${NORMAL_USER_HOME}/firefox-src
 # RUN mkdir -p ${NORMAL_USER_HOME}/firefox-src \

bin/entry.sh

@@ -17,8 +17,10 @@ service dbus status
 export $(dbus-launch)
 export NSS_USE_SHARED_DB=ENABLED
 echo "-- INFO: DBUS_SESSION_BUS_ADDRESS=${DBUS_SESSION_BUS_ADDRESS}"
+#=> e.g. DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-APZO4BE4TJ,guid=6e9c098d053d3038cb0756ae57ecc885
 echo "-- INFO: DBUS_SESSION_BUS_PID=${DBUS_SESSION_BUS_PID}"
-
+#=> e.g. DBUS_SESSION_BUS_PID=44
+#
 #-----------------------------------------------
 # Perform cleanup to support `docker restart`
 stop 2>&1 >/dev/null || true

test/before_install_docker_linux

@@ -7,6 +7,7 @@ set -xe
 # cleanup
 service docker stop || true
 rm -f /etc/apt/sources.list.d/docker.list
+rm -f /usr/lib/systemd/system/docker.service
 apt-get -qqy purge lxc-docker || true
 apt-get -qqy purge docker-engine || true
 /etc/init.d/apparmor stop || true

test/script_push

@@ -30,7 +30,7 @@ docker_login_tag_push() {
   docker tag selenium:latest elgalu/selenium:latest
   docker push elgalu/selenium:${TRAVIS_TAG} | tee docker_push.log
   if [ "${DOCKER_PUSH_LATEST}" != "true" ]; then
-    echo "DOCKER_PUSH_LATEST is false so don't update tag :latest"
+    echo "DOCKER_PUSH_LATEST is false (probably a beta release) so don't update tag ':latest'"
   else
     docker push elgalu/selenium:latest
   fi

test/script_scenario_compose_1_1

@@ -29,7 +29,7 @@ export COMPOSE_FILE="docker-compose-host.yml" \
 echo "#===================================================================="
 echo "# Scenario 5b [compose_1_1]: Docker Compose 1 hub, 1 chrome, 1 firefox"
 echo "#===================================================================="
-export VNC_FROM_PORT="32900" VNC_TO_PORT="32950"
+export VNC_FROM_PORT="54900" VNC_TO_PORT="54950"
 export COMPOSE_FILE="docker-compose.yml" \
        DO_COMPOSE_UP="true"
 ./test/compose-test.sh