Skip to content
This repository was archived by the owner on Jun 30, 2021. It is now read-only.

Commit 6040426

Browse files
committed
Upgrade Sauce Connect 4.3.10. Upgrade FF 40.0.2
1 parent dca1d2e commit 6040426

File tree

4 files changed

+20
-16
lines changed

4 files changed

+20
-16
lines changed

CHANGELOG.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ Note image ids also change after scm-source.json has being updated which trigger
77
How to get container versions
88

99
java -version && python --version && firefox -version
10-
chromedriver --version
11-
google-chrome-stable --version
12-
google-chrome-beta --version
13-
google-chrome-unstable --version
10+
chromedriver --version && echo "\n"
11+
google-chrome-stable --version && echo "\n"
12+
google-chrome-beta --version && echo "\n"
13+
google-chrome-unstable --version && echo "\n"
14+
sc | grep build && BrowserStackLocal -version
1415

1516
## 2.47.1e (2015-08-14)
1617
+ Upgrade from wily-20150731 to 20150807 (Leo Gallucci)
17-
+ Add Firefox 40.0 and upgrade Chrome patch levels.
18+
+ Add Firefox 40.0.2 and upgrade Chrome patch levels.
1819
+ Include Sauce Connect tunneling support.
1920
+ Include BrowserStack tunneling support.
2021
+ Image tag details:
@@ -23,7 +24,7 @@ How to get container versions
2324
+ Chrome beta: 45.0.2454.37
2425
+ Chrome dev (unstable): 46.0.2478.0
2526
+ Firefox versions in this image:
26-
40.0 39.0.3 38.0.6 37.0.2 36.0.4
27+
40.0.2 39.0.3 38.0.6 37.0.2 36.0.4
2728
35.0.1 34.0.5 33.0.3 32.0.3 31.0 30.0
2829
29.0.1 28.0 27.0.1 26.0 25.0.1 24.0
2930
+ chromedriver: 2.17.340116 (2557bebb9de060c37c1a5d8d51ef72bb91106af6)
@@ -32,8 +33,10 @@ How to get container versions
3233
+ Built with: Docker version 1.8.1, build d12ea79
3334
+ FROM ubuntu:wily-20150807
3435
+ Python: 2.7.10
35-
+ Image ID: 6f267b9a571466c2bdca32b096d6f3704f1e729d5346eccbcb22071719a776e6
36-
+ Digest: sha256:22d35c93fbef588d1941ea880c19d2d6f93becefa07f9dfe2d3acf9906458116
36+
+ Sauce Connect 4.3.10, build 1731 2bab8b6
37+
+ BrowserStack Local version 3.7
38+
+ Image ID: TBD
39+
+ Digest: sha256:TBD
3740

3841
## 2.47.1d (2015-08-07)
3942
+ Upgrade from wily-20150708 to 20150731 (Leo Gallucci)

Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -497,14 +497,15 @@ RUN cd ${NORMAL_USER_HOME}/firefox-src \
497497
# Sauce Connect Tunneling #
498498
# ------------------------#
499499
# https://docs.saucelabs.com/reference/sauce-connect/
500-
ENV SAUCE_CONN_VER="sc-4.3-linux" \
500+
ENV SAUCE_CONN_VER="sc-4.3.10-linux" \
501501
SAUCE_CONN_DOWN_URL="https://saucelabs.com/downloads"
502502
RUN cd /tmp \
503503
&& wget --no-verbose "${SAUCE_CONN_DOWN_URL}/${SAUCE_CONN_VER}.tar.gz" \
504504
&& tar -zxf ${SAUCE_CONN_VER}.tar.gz \
505+
&& rm -rf /usr/local/${SAUCE_CONN_VER} \
505506
&& mv ${SAUCE_CONN_VER} /usr/local \
506507
&& ln -sf /usr/local/${SAUCE_CONN_VER}/bin/sc /usr/local/bin/sc \
507-
&& sc | grep build
508+
&& which sc
508509

509510
# -----------------------#
510511
# BrowserStack Tunneling #
@@ -518,14 +519,14 @@ RUN cd /tmp \
518519
&& chmod 755 BrowserStackLocal \
519520
&& rm ${BSTACK_TUNNEL_ZIP} \
520521
&& mv BrowserStackLocal /usr/local/bin \
521-
&& BrowserStackLocal -version
522+
&& which BrowserStackLocal
522523

523524
#---------------------#
524525
# FIREFOX_VERSIONS 40 #
525526
#---------------------#
526527
# Latest available firefox version
527528
# ENV FIREFOX_LATEST_VERSION latest #this also wors
528-
ENV FIREFOX_VERSIONS3 "40.0"
529+
ENV FIREFOX_VERSIONS3 "40.0.2"
529530
RUN cd ${NORMAL_USER_HOME}/firefox-src \
530531
&& for FF_VER in $(echo ${FIREFOX_VERSIONS3} | tr "," "\n"); do \
531532
mozdownload --application=firefox \
@@ -714,7 +715,7 @@ COPY ./dns/etc/hosts /tmp/hosts
714715
ENV FIREFOX_VERSIONS="${FIREFOX_VERSIONS1}, ${FIREFOX_VERSIONS2}, ${FIREFOX_VERSIONS3}" \
715716
# Firefox version to use during run
716717
# For firefox please pick one of $FIREFOX_VERSIONS, default latest
717-
FIREFOX_VERSION="40.0" \
718+
FIREFOX_VERSION="40.0.2" \
718719
# Default chrome flavor, options: stable|beta|unstable
719720
CHROME_FLAVOR="stable" \
720721
# User and home

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ There are also additional steps you can take to ensure you're using the correct
139139
You can simply verify that image id is indeed the correct one.
140140

141141
# e.g. full image id for tag 2.47.1e
142-
export IMGID=6f267b9a571466c2bdca32b096d6f3704f1e729d5346eccbcb22071719a776e6
142+
export IMGID=TBD
143143
if docker inspect -f='{{.Id}}' elgalu/selenium:2.47.1e |grep ${IMGID} &> /dev/null; then
144144
echo "Image ID tested ok"
145145
else
@@ -151,7 +151,7 @@ You can simply verify that image id is indeed the correct one.
151151
Given docker.io currently allows to push the same tag image twice this represent a security concern but since docker >= 1.6.2 is possible to fetch the digest sha256 instead of the tag so you can be sure you're using the exact same docker image every time:
152152

153153
# e.g. sha256 for tag 2.47.1e
154-
export SHA=22d35c93fbef588d1941ea880c19d2d6f93becefa07f9dfe2d3acf9906458116
154+
export SHA=TBD
155155
docker pull elgalu/selenium@sha256:${SHA}
156156

157157
You can find all digests sha256 and image ids per tag in the [CHANGELOG](./CHANGELOG.md) so as of now you just need to trust the sha256 in the CHANGELOG. Bullet proof is to fork this project and build the images yourself if security is a big concern.

saucelabs/bin/wait-saucelabs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ die () {
1616
exit $errnum
1717
}
1818

19-
export DONE_MSG="Connection established."
19+
export DONE_MSG="Sauce Connect is up, you may start your tests."
2020

2121
if [ "${SAUCE_TUNNEL}" = "true" ]; then
2222
echo "Waiting for Sauce Labs tunnel to start..."

0 commit comments

Comments
 (0)