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

Commit f36ad67

Browse files
committed
Bump versions for 3.6.0-p5
1 parent ed3ae5a commit f36ad67

File tree

6 files changed

+37
-6
lines changed

6 files changed

+37
-6
lines changed

CHANGELOG.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,34 @@ Note image ids also change after scm-source.json has being updated which trigger
77
###### To get container versions
88
docker exec grid versions
99

10+
## TBD_DOCKER_TAG
11+
+ **Changes:** https://github.com/elgalu/docker-selenium/compare/3.6.0-p4...3.6.0-p5 (TBD_DATE)
12+
+ Upgrade Chrome patch to 62.0.3202.75
13+
+ Upgrade Firefox patch to 56.0.2
14+
+ Use ARG instruction for label:selenium_chrome_version
15+
+ Use ARG instruction for env:FF_VER and label:selenium_firefox_version
16+
+ Use ARG instruction for env:SEL_VER and label:selenium_version
17+
+ assert env:CH_STABLE_VER equals ARG:EXPECTED_CHROME_VERSION
18+
+ **Image tag details:**
19+
+ Selenium version: TBD_SELENIUM_VERSION (TBD_SELENIUM_REVISION)
20+
+ Chrome stable: TBD_CHROME_STABLE
21+
+ Firefox stable: TBD_FIREFOX_VERSION
22+
+ Geckodriver: TBD_GECKO_DRIVER
23+
+ Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
24+
+ Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
25+
+ Timezone: TBD_TIME_ZONE
26+
+ FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
27+
+ Python: TBD_PYTHON_VERSION
28+
+ Tested on kernel dev host: 4.4.0-97-generic x86_64
29+
+ Tested on kernel CI host: TBD_HOST_UNAME
30+
+ Built at dev host with: Docker version 17.10.0-ce, build f4ffd25
31+
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
32+
+ Built at dev host with: Docker Compose version 1.17.0-rc1, build a0f95af
33+
+ Built at CI host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
34+
+ Image size: TBD_IMAGE_SIZE
35+
+ Digest: TBD_DIGEST
36+
+ Image ID: TBD_IMAGE_ID
37+
1038
## 3.6.0-p4
1139
+ **Changes:** https://github.com/elgalu/docker-selenium/compare/3.6.0-p3...3.6.0-p4 (2017-10-19)
1240
+ Upgrade Chrome major to 62.0.3202.62

Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ RUN echo "${UBUNTU_FLAVOR}" > UBUNTU_FLAVOR \
262262
# Selenium latest
263263
#=================
264264
# Layer size: medium ~22 MB
265-
ENV SEL_DIRECTORY="3.6" \
266-
SEL_VER="3.6.0"
265+
ARG SEL_DIRECTORY="3.6"
266+
ARG SEL_VER="3.6.0"
267267

268268
RUN echo $SEL_VER
269269
RUN export SELBASE="https://selenium-release.storage.googleapis.com" \
@@ -272,7 +272,7 @@ RUN export SELBASE="https://selenium-release.storage.googleapis.com" \
272272
&& ln -s "selenium-server-standalone-${SEL_VER}.jar" \
273273
"selenium-server-standalone-3.jar"
274274

275-
LABEL selenium_version "3.6.0"
275+
LABEL selenium_version "${SEL_VER}"
276276

277277
#=============================
278278
# sudo by default from now on
@@ -593,6 +593,7 @@ ENV FF_LANG="en-US" \
593593
#--- For Selenium 3
594594
# Layer size: big: 108.2 MB
595595
ARG FF_VER="56.0.2"
596+
596597
ENV FF_COMP="firefox-${FF_VER}.tar.bz2"
597598
ENV FF_URL="${FF_BASE_URL}/${FF_INNER_PATH}/${FF_VER}/${FF_PLATFORM}/${FF_LANG}/${FF_COMP}"
598599
RUN cd /opt \
@@ -623,6 +624,7 @@ RUN wget --no-verbose -O geckodriver.tar.gz \
623624
&& rm geckodriver.tar.gz
624625

625626
COPY bin/fail /usr/bin/
627+
626628
#===============
627629
# Google Chrome
628630
#===============
@@ -650,6 +652,7 @@ RUN apt-get -qqy update \
650652
&& export CH_STABLE_VER=$(/usr/bin/google-chrome-stable --version | grep -iEo "${GREP_ONLY_NUMS_VER}") \
651653
&& echo "CH_STABLE_VER:'${CH_STABLE_VER}' vs EXPECTED_CHROME_VERSION:'${EXPECTED_CHROME_VERSION}'" \
652654
&& [ "${CH_STABLE_VER}" = "${EXPECTED_CHROME_VERSION}" ] || fail
655+
653656
# We have a wrapper for /opt/google/chrome/google-chrome
654657
RUN mv /opt/google/chrome/google-chrome /opt/google/chrome/google-chrome-base
655658
COPY selenium-node-chrome/opt /opt

TBD_DOCKER_TAG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
+ Timezone: TBD_TIME_ZONE
1212
+ FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
1313
+ Python: TBD_PYTHON_VERSION
14-
+ Tested on kernel dev host: 4.4.0-96-generic x86_64
14+
+ Tested on kernel dev host: 4.4.0-97-generic x86_64
1515
+ Tested on kernel CI host: TBD_HOST_UNAME
1616
+ Built at dev host with: Docker version 17.10.0-ce, build f4ffd25
1717
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6.0-p4
1+
3.6.0-p5

images/grid3_console.png

-138 Bytes
Loading

scm-source.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"url": "https://github.com/elgalu/docker-selenium",
3-
"revision": "e97e3285a2d40a32becd0bb5264672af14e772b1",
3+
"revision": "147272fa21298a3b4f0a789e5f4a2a46b850affb",
44
"author": "lgallucci",
55
"status": ""
66
}

0 commit comments

Comments
 (0)