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

Commit 4211c70

Browse files
committed
Upgrade to ubuntu wily-20150731, to Firefox 39.0.3, Chrome path 130, to Java 1.8.0_66. Missed FF 36.0.4
1 parent 107ab61 commit 4211c70

File tree

5 files changed

+107
-63
lines changed

5 files changed

+107
-63
lines changed

CHANGELOG.md

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,30 @@ Note sha256 digests are generated after pushing the image to the registry theref
44

55
Note image ids also change after scm-source.json has being updated which triggers a cyclic problem so value TBD will be set here and updated in the [release][] page by navigating into any release tag.
66

7+
## 2.47.1d (2015-08-07)
8+
+ Upgrade from wily-20150708 to 20150731 (Leo Gallucci)
9+
+ Upgrade Firefox from 39.0 to 39.0.3
10+
+ Upgrade Chrome stable patch level from 125 to 130
11+
+ Upgrade Java from 1.8.0_60 to 1.8.0_66
12+
+ Include missed Firefox version 36.0.4
13+
+ Image tag details:
14+
+ Selenium: v2.47.1 (411b314)
15+
+ Chrome stable: 44.0.2403.130
16+
+ Chrome beta: 45.0.2454.26
17+
+ Chrome dev: 46.0.2471.2
18+
+ Firefox versions in this image:
19+
39.0.3 38.0.6 37.0.2 36.0.4
20+
35.0.1 34.0.5 33.0.3 32.0.3 31.0 30.0
21+
29.0.1 28.0 27.0.1 26.0 25.0.1 24.0
22+
+ chromedriver: 2.17.340116 (2557bebb9de060c37c1a5d8d51ef72bb91106af6)
23+
+ Java: 1.8.0_66-internal OpenJDK 64-Bit 1.8.0_66-b01
24+
+ Timezone: Europe/Berlin
25+
+ Built with: Docker version 1.7.1, build 786b29d
26+
+ FROM ubuntu:wily-20150731
27+
+ Python: 2.7.10
28+
+ Image ID: TBD
29+
+ Digest: sha256:TBD
30+
731
## 2.47.1c (2015-08-03)
832
+ Upgrade chromedriver from 2.16 to 2.17 (Leo Gallucci)
933
+ Upgrade chrome unstable from 45 to 46.0.2467.2
@@ -15,7 +39,7 @@ Note image ids also change after scm-source.json has being updated which trigger
1539
+ Chrome beta: 45.0.2454.15
1640
+ Chrome dev: 46.0.2467.2
1741
+ Firefox versions in this image:
18-
39.0 38.0.6 37.0.2 36.0.4
42+
39.0 38.0.6 37.0.2
1943
35.0.1 34.0.5 33.0.3 32.0.3 31.0 30.0
2044
29.0.1 28.0 27.0.1 26.0 25.0.1 24.0
2145
+ chromedriver: 2.17.340116 (2557bebb9de060c37c1a5d8d51ef72bb91106af6)
@@ -37,7 +61,7 @@ Note image ids also change after scm-source.json has being updated which trigger
3761
+ Chrome beta: 45.0.2454.15
3862
+ Chrome dev: 45.0.2454.15
3963
+ Firefox versions in this image:
40-
39.0 38.0.6 37.0.2 36.0.4
64+
39.0 38.0.6 37.0.2
4165
35.0.1 34.0.5 33.0.3 32.0.3 31.0 30.0
4266
29.0.1 28.0 27.0.1 26.0 25.0.1 24.0
4367
+ chromedriver: 2.16.333243 (0bfa1d3575fc1044244f21ddb82bf870944ef961)
@@ -59,7 +83,7 @@ Note image ids also change after scm-source.json has being updated which trigger
5983
+ Chrome beta: 44.0.2403.89
6084
+ Chrome dev: 45.0.2454.7
6185
+ Firefox versions in this image:
62-
39.0 38.0.6 37.0.2 36.0.4
86+
39.0 38.0.6 37.0.2
6387
35.0.1 34.0.5 33.0.3 32.0.3 31.0 30.0
6488
29.0.1 28.0 27.0.1 26.0 25.0.1 24.0
6589
+ chromedriver: 2.16.333243 (0bfa1d3575fc1044244f21ddb82bf870944ef961)
@@ -80,7 +104,7 @@ Note image ids also change after scm-source.json has being updated which trigger
80104
+ Chrome beta: 44.0.2403.89
81105
+ Chrome dev: 45.0.2454.7
82106
+ Firefox versions in this image:
83-
39.0 38.0.6 37.0.2 36.0.4
107+
39.0 38.0.6 37.0.2
84108
35.0.1 34.0.5 33.0.3 32.0.3 31.0 30.0
85109
29.0.1 28.0 27.0.1 26.0 25.0.1 24.0
86110
+ chromedriver: 2.16.333243 (0bfa1d3575fc1044244f21ddb82bf870944ef961)
@@ -104,7 +128,7 @@ Note image ids also change after scm-source.json has being updated which trigger
104128
+ Chrome beta: 44.0.2403.89
105129
+ Chrome dev: 45.0.2454.7
106130
+ Firefox versions in this image:
107-
39.0 38.0.6 37.0.2 36.0.4
131+
39.0 38.0.6 37.0.2
108132
35.0.1 34.0.5 33.0.3 32.0.3 31.0 30.0
109133
29.0.1 28.0 27.0.1 26.0 25.0.1 24.0
110134
+ chromedriver: 2.16.333243 (0bfa1d3575fc1044244f21ddb82bf870944ef961)
@@ -126,7 +150,7 @@ Note image ids also change after scm-source.json has being updated which trigger
126150
+ Chrome beta: 44.0.2403.81
127151
+ Chrome dev: 45.0.2454.6
128152
+ Firefox versions in this image:
129-
39.0 38.0.6 37.0.2 36.0.4
153+
39.0 38.0.6 37.0.2
130154
35.0.1 34.0.5 33.0.3 32.0.3 31.0 30.0
131155
29.0.1 28.0 27.0.1 26.0 25.0.1 24.0
132156
+ chromedriver: 2.16.333243 (0bfa1d3575fc1044244f21ddb82bf870944ef961)
@@ -147,7 +171,7 @@ Note image ids also change after scm-source.json has being updated which trigger
147171
+ Chrome beta: 44.0.2403.81
148172
+ Chrome dev: 45.0.2454.6
149173
+ Firefox versions in this image:
150-
39.0 38.0.6 37.0.2 36.0.4
174+
39.0 38.0.6 37.0.2
151175
35.0.1 34.0.5 33.0.3 32.0.3 31.0 30.0
152176
29.0.1 28.0 27.0.1 26.0 25.0.1 24.0
153177
+ chromedriver: 2.16.333243 (0bfa1d3575fc1044244f21ddb82bf870944ef961)
@@ -172,7 +196,7 @@ Note image ids also change after scm-source.json has being updated which trigger
172196
+ Chrome beta: 44.0.2403.81
173197
+ Chrome dev: 45.0.2454.6
174198
+ Firefox versions in this image:
175-
39.0 38.0.6 37.0.2 36.0.4
199+
39.0 38.0.6 37.0.2
176200
35.0.1 34.0.5 33.0.3 32.0.3 31.0 30.0
177201
29.0.1 28.0 27.0.1 26.0 25.0.1 24.0
178202
+ chromedriver: 2.16.333243 (0bfa1d3575fc1044244f21ddb82bf870944ef961)

Dockerfile

Lines changed: 42 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
###################################################
44
#== Ubuntu wily is 15.10.x, i.e. FROM ubuntu:15.10
55
# search for more at https://registry.hub.docker.com/_/ubuntu/tags/manage/
6-
FROM ubuntu:wily-20150708
6+
# next: wily-TBD
7+
FROM ubuntu:wily-20150731
78
ENV UBUNTU_FLAVOR wily
89

910
#== Ubuntu vivid is 15.04.x, i.e. FROM ubuntu:15.04
@@ -176,6 +177,15 @@ RUN apt-get update -qqy \
176177
openbox obconf menu \
177178
&& rm -rf /var/lib/apt/lists/*
178179

180+
#=========
181+
# fluxbox
182+
# A fast, lightweight and responsive window manager
183+
#=========
184+
RUN apt-get update -qqy \
185+
&& apt-get -qqy install \
186+
fluxbox \
187+
&& rm -rf /var/lib/apt/lists/*
188+
179189
#========================================
180190
# Add normal user with passwordless sudo
181191
#========================================
@@ -394,9 +404,9 @@ RUN pip install --upgrade \
394404
"https://github.com/Supervisor/supervisor/zipball/b3ad59703b554f" \
395405
&& rm -rf /var/lib/apt/lists/*
396406

397-
#-------------------#
398-
# FIREFOX_VERSIONS1 #
399-
#-------------------#
407+
#----------------------------#
408+
# FIREFOX_VERSIONS: 24 to 29 #
409+
#----------------------------#
400410
# Will split firefox versions in smaller chunks so the layers are smaller
401411
# All firefox versions we provide from oldes to newest
402412
ENV FIREFOX_VERSIONS1 "24.0, 25.0.1, 26.0, 27.0.1, 28.0, 29.0.1"
@@ -413,10 +423,10 @@ RUN cd ${NORMAL_USER_HOME}/firefox-src \
413423
&& rm firefox-${FF_VER}.${FF_LANG}.linux64.tar.bz2 \
414424
;done
415425

416-
#-------------------#
417-
# FIREFOX_VERSIONS2 #
418-
#-------------------#
419-
ENV FIREFOX_VERSIONS2 "30.0, 31.0, 32.0.3, 33.0.3, 34.0.5, 35.0.1"
426+
#----------------------------#
427+
# FIREFOX_VERSIONS: 30 to 34 #
428+
#----------------------------#
429+
ENV FIREFOX_VERSIONS2 "30.0, 31.0, 32.0.3, 33.0.3, 34.0.5"
420430
RUN cd ${NORMAL_USER_HOME}/firefox-src \
421431
&& for FF_VER in $(echo ${FIREFOX_VERSIONS2} | tr "," "\n"); do \
422432
mozdownload --application=firefox \
@@ -430,12 +440,31 @@ RUN cd ${NORMAL_USER_HOME}/firefox-src \
430440
&& rm firefox-${FF_VER}.${FF_LANG}.linux64.tar.bz2 \
431441
;done
432442

433-
#-------------------#
434-
# FIREFOX_VERSIONS3 #
435-
#-------------------#
443+
#----------------------------#
444+
# FIREFOX_VERSIONS: 35 to 38 #
445+
#----------------------------#
436446
# Latest available firefox version
437447
# ENV FIREFOX_LATEST_VERSION latest #this also wors
438-
ENV FIREFOX_VERSIONS3 "36.0.4, 37.0.2, 38.0.6, 39.0"
448+
ENV FIREFOX_VERSIONS3 "35.0.1, 36.0.4, 37.0.2, 38.0.6"
449+
RUN cd ${NORMAL_USER_HOME}/firefox-src \
450+
&& for FF_VER in $(echo ${FIREFOX_VERSIONS3} | tr "," "\n"); do \
451+
mozdownload --application=firefox \
452+
--locale=${FF_LANG} --retry-attempts=1 \
453+
--platform=linux64 --log-level=WARN --version=${FF_VER} \
454+
&& export FIREFOX_DEST="${SEL_HOME}/firefox-${FF_VER}" \
455+
&& mkdir -p ${FIREFOX_DEST} \
456+
&& mozinstall --app=firefox \
457+
firefox-${FF_VER}.${FF_LANG}.linux64.tar.bz2 \
458+
--destination=${FIREFOX_DEST} \
459+
&& rm firefox-${FF_VER}.${FF_LANG}.linux64.tar.bz2 \
460+
;done
461+
462+
#---------------------#
463+
# FIREFOX_VERSIONS 39 #
464+
#---------------------#
465+
# Latest available firefox version
466+
# ENV FIREFOX_LATEST_VERSION latest #this also wors
467+
ENV FIREFOX_VERSIONS3 "39.0.3"
439468
RUN cd ${NORMAL_USER_HOME}/firefox-src \
440469
&& for FF_VER in $(echo ${FIREFOX_VERSIONS3} | tr "," "\n"); do \
441470
mozdownload --application=firefox \
@@ -451,15 +480,6 @@ RUN cd ${NORMAL_USER_HOME}/firefox-src \
451480
&& chown -R ${NORMAL_USER}:${NORMAL_GROUP} ${SEL_HOME} \
452481
&& chown -R ${NORMAL_USER}:${NORMAL_GROUP} ${NORMAL_USER_HOME}
453482

454-
#=========
455-
# fluxbox
456-
# A fast, lightweight and responsive window manager
457-
#=========
458-
RUN apt-get update -qqy \
459-
&& apt-get -qqy install \
460-
fluxbox \
461-
&& rm -rf /var/lib/apt/lists/*
462-
463483
#=====================
464484
# Use Normal User now
465485
#=====================
@@ -629,7 +649,7 @@ COPY ./dns/etc/hosts /tmp/hosts
629649
ENV FIREFOX_VERSIONS="${FIREFOX_VERSIONS1}, ${FIREFOX_VERSIONS2}, ${FIREFOX_VERSIONS3}" \
630650
# Firefox version to use during run
631651
# For firefox please pick one of $FIREFOX_VERSIONS, default latest
632-
FIREFOX_VERSION="39.0" \
652+
FIREFOX_VERSION="39.0.3" \
633653
# Default chrome flavor, options: stable|beta|unstable
634654
CHROME_FLAVOR="stable" \
635655
# User and home

README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Note SeleniumHQ/docker-selenium project is more useful for building selenium gri
1919
In general: add `sudo` only if needed in your environment and `--privileged` if you really need it.
2020

2121
sudo docker run --privileged -p 4444:24444 -p 5920:25900 \
22-
-e VNC_PASSWORD=hola elgalu/selenium:2.47.1c
22+
-e VNC_PASSWORD=hola elgalu/selenium:2.47.1d
2323

2424
### Non-privileged
2525
### Run
@@ -31,7 +31,7 @@ If your setup is correct, privileged mode and sudo should not be necessary:
3131
-e SCREEN_WIDTH=1920 -e SCREEN_HEIGHT=1080 \
3232
-e VNC_PASSWORD=hola \
3333
-e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" \
34-
elgalu/selenium:2.47.1c
34+
elgalu/selenium:2.47.1d
3535

3636
Make sure `docker run` finishes with **selenium all done and ready for testing** else you won't be able to start your tests. To perform this check programatically please use this command where `ch` is the name of the container:
3737

@@ -96,7 +96,7 @@ You can lunch a grid only container via environment variables:
9696

9797
docker run --rm --name=hub -p 4444:24444 -p 5930:25900 -p 2223:22222 \
9898
-p=6081:26080 -e CHROME=false -e FIREFOX=false \
99-
elgalu/selenium:2.47.1c
99+
elgalu/selenium:2.47.1d
100100

101101
The important part above is `-e CHROME=false -e FIREFOX=false` which tells the docker image not run run default chorme and firefox nodes turning the container into a grid-only one.
102102

@@ -112,7 +112,7 @@ You can lunch a node only container via environment variables:
112112
-p 25550:25550 -p 25551:25551 \
113113
-e GRID=false -e CHROME=true -e FIREFOX=true \
114114
-v $(pwd)/videos:/videos \
115-
elgalu/selenium:2.47.1c
115+
elgalu/selenium:2.47.1d
116116

117117
The important part above is `-e GRID=false` which tells the container to be a node-only node, this this case with 2 browsers `-e CHROME=true -e FIREFOX=true` but could be just 1.
118118

@@ -137,9 +137,9 @@ There are also additional steps you can take to ensure you're using the correct
137137

138138
You can simply verify that image id is indeed the correct one.
139139

140-
# e.g. full image id for tag 2.47.1c
141-
export IMGID=c627036423aa4fa4baea37b24a8ab6fa08e713935ff771f3e3a45881f4319b21
142-
if docker inspect -f='{{.Id}}' elgalu/selenium:2.47.1c |grep ${IMGID} &> /dev/null; then
140+
# e.g. full image id for tag 2.47.1d
141+
export IMGID=TBD
142+
if docker inspect -f='{{.Id}}' elgalu/selenium:2.47.1d |grep ${IMGID} &> /dev/null; then
143143
echo "Image ID tested ok"
144144
else
145145
echo "Image ID doesn't match"
@@ -149,8 +149,8 @@ You can simply verify that image id is indeed the correct one.
149149

150150
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:
151151

152-
# e.g. sha256 for tag 2.47.1c
153-
export SHA=9a0df41fb5228ae6bf184c97b706aec33a453e3190a546cbb9e9fe00ac73128c
152+
# e.g. sha256 for tag 2.47.1d
153+
export SHA=TBD
154154
docker pull elgalu/selenium@sha256:${SHA}
155155

156156
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.
@@ -169,7 +169,7 @@ Host machine, terminal 2:
169169
docker run --rm --name=ch -p=4470:24444 \
170170
-e SCREEN_WIDTH -e SCREEN_HEIGHT -e XE_DISP_NUM \
171171
-v /tmp/.X11-unix/X${XE_DISP_NUM}:/tmp/.X11-unix/X${XE_DISP_NUM} \
172-
elgalu/selenium:2.47.1c
172+
elgalu/selenium:2.47.1d
173173

174174
Now when you run your tests instead of connecting. If docker run fails try `xhost +`
175175

@@ -191,7 +191,7 @@ ANYPORT=0
191191
REMOTE_DOCKER_SRV=localhost
192192
CONTAINER=$(docker run -d -p=0.0.0.0:${ANYPORT}:22222 -p=0.0.0.0:${ANYPORT}:24444 \
193193
-p=0.0.0.0:${ANYPORT}:25900 -e SCREEN_HEIGHT=1110 -e VNC_PASSWORD=hola \
194-
-e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:2.47.1c
194+
-e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:2.47.1d
195195
196196
# -- Option 2.docker run- Running docker on remote docker server like in the cloud
197197
# Useful if the docker server is running in the cloud. Establish free local ports
@@ -201,7 +201,7 @@ ssh ${REMOTE_DOCKER_SRV} #get into the remote docker provider somehow
201201
# it acts as a jump host so my public key is already on that server
202202
CONTAINER=$(docker run -d -p=0.0.0.0:${ANYPORT}:22222 -e SCREEN_HEIGHT=1110 \
203203
-e VNC_PASSWORD=hola -e SSH_AUTH_KEYS="$(cat ~/.ssh/authorized_keys)" \
204-
elgalu/selenium:2.47.1c
204+
elgalu/selenium:2.47.1d
205205
206206
# -- Common: Wait for the container to start
207207
./host-scripts/wait-docker-selenium.sh ch 7s
@@ -272,7 +272,7 @@ If you git clone this repo locally, i.e. cd into where the Dockerfile is, you ca
272272
273273
If you prefer to download the final built image from docker you can pull it, personally I always prefer to build them manually except for the base images like Ubuntu 14.04.2:
274274
275-
docker pull elgalu/selenium:2.47.1c
275+
docker pull elgalu/selenium:2.47.1d
276276
277277
#### 2. Use this image
278278

0 commit comments

Comments
 (0)