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

Commit 953c35a

Browse files
committed
Fix: Do not set --user-data-dir
1 parent 911ae5d commit 953c35a

File tree

5 files changed

+39
-13
lines changed

5 files changed

+39
-13
lines changed

CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,31 @@ 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/TBD_PREV_COMM...TBD_CUR_COMM (TBD_DATE)
12+
+ Fix: Do not set --user-data-dir as it breaks the ability of clients to set Chrome options via the capabilities
13+
+ Continue deprecating Selenium 2
14+
+ Chrome arg default: --disable-infobars
15+
+ **Image tag details:**
16+
+ Selenium 3: TBD_SELENIUM_3_VERSION (TBD_SELENIUM_3_REVISION)
17+
+ Chrome stable: TBD_CHROME_STABLE
18+
+ Firefox for Selenium 3: TBD_FIREFOX_FOR_SEL3
19+
+ Geckodriver: TBD_GECKO_DRIVER
20+
+ Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
21+
+ Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
22+
+ Timezone: TBD_TIME_ZONE
23+
+ FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
24+
+ Python: TBD_PYTHON_VERSION
25+
+ Tested on kernel dev host: 4.4.0-75-generic x86_64
26+
+ Tested on kernel CI host: TBD_HOST_UNAME
27+
+ Built at dev host with: Docker version 17.03.1-ce, build c6d412e
28+
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
29+
+ Built at dev host with: Docker Compose version 1.11.2, build dfed245
30+
+ Built at CI host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
31+
+ Image size: TBD_IMAGE_SIZE
32+
+ Digest: TBD_DIGEST
33+
+ Image ID: TBD_IMAGE_ID
34+
1035
## 3.3.1-p5
1136
+ **Changes:** https://github.com/elgalu/docker-selenium/compare/e5f198e1486630c19283d...c4e8df12781eb031795ea6 (2017-04-24)
1237
+ Guard transfer-logs.sh when -e CHROME=false

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ For pull requests or local commits:
1212

1313
For repository owners only:
1414

15-
git commit -m "Guard transfer-logs.sh when -e CHROME=false"
15+
git commit -m "Fix: Do not set --user-data-dir"
1616
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
1717

1818
-- Wait for Travis to pass OK

TBD_DOCKER_TAG.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22
+ **Changes:** https://github.com/elgalu/docker-selenium/compare/TBD_PREV_COMM...TBD_CUR_COMM (TBD_DATE)
33
+ TBD_COMMIT_MSG
44
+ **Image tag details:**
5-
+ Selenium 2: TBD_SELENIUM_2_VERSION (TBD_SELENIUM_2_REVISION)
65
+ Selenium 3: TBD_SELENIUM_3_VERSION (TBD_SELENIUM_3_REVISION)
76
+ Chrome stable: TBD_CHROME_STABLE
8-
+ Firefox for Selenium 2: TBD_FIREFOX_FOR_SEL2
97
+ Firefox for Selenium 3: TBD_FIREFOX_FOR_SEL3
108
+ Geckodriver: TBD_GECKO_DRIVER
119
+ Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
1210
+ Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
1311
+ Timezone: TBD_TIME_ZONE
1412
+ FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
1513
+ Python: TBD_PYTHON_VERSION
16-
+ Tested on kernel dev host: 4.4.0-72-generic x86_64
14+
+ Tested on kernel dev host: 4.4.0-75-generic x86_64
1715
+ Tested on kernel CI host: TBD_HOST_UNAME
1816
+ Built at dev host with: Docker version 17.03.1-ce, build c6d412e
1917
+ 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.3.1-p5
1+
3.3.1-p6

bin/entry.sh

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,6 @@ export VNC_TRYOUT_ERR_LOG="${LOGS_DIR}/vnc-tryouts-stderr"
7575
export VNC_TRYOUT_OUT_LOG="${LOGS_DIR}/vnc-tryouts-stdout"
7676
touch ${DOCKER_SELENIUM_STATUS}
7777

78-
# https://github.com/SeleniumHQ/selenium/issues/2078#issuecomment-218320864
79-
# https://github.com/SeleniumHQ/selenium/blob/master/py/selenium/webdriver/firefox/firefox_binary.py#L27
80-
echo "webdriver.log.file has been discontinued. Please send us a PR if you know how to set the path for the Firefox browser logs" \
81-
> "${LOGS_DIR}/firefox_browser.log"
82-
8378
# We recalculate screen dimensions because docker run supports changing them
8479
export SCREEN_DEPTH="${SCREEN_MAIN_DEPTH}+${SCREEN_SUB_DEPTH}"
8580
export GEOMETRY="${SCREEN_WIDTH}""x""${SCREEN_HEIGHT}""x""${SCREEN_DEPTH}"
@@ -174,10 +169,18 @@ fi
174169
# Fix extra quotes in Time zone $TZ env var
175170
export TZ=$(echo ${TZ} | sed "s/^\([\"']\)\(.*\)\1\$/\2/g")
176171

172+
# https://github.com/SeleniumHQ/selenium/issues/2078#issuecomment-218320864
173+
# https://github.com/SeleniumHQ/selenium/blob/master/py/selenium/webdriver/firefox/firefox_binary.py#L27
174+
echo "webdriver.log.file has been discontinued." > "${LOGS_DIR}/firefox_browser.log"
175+
echo "Please send us a PR if you know how to set the path for the Firefox browser logs." >> "${LOGS_DIR}/firefox_browser.log"
176+
177+
echo "Setting --user-data-dir=/home/seluser/chrome-user-data-dir" > "${LOGS_DIR}/chrome_browser.log"
178+
echo "breaks the ability of clients to set Chrome options via the capabilities." >> "${LOGS_DIR}/chrome_browser.log"
179+
echo "Please send us a PR if you know how to set the path for the Firefox browser logs." >> "${LOGS_DIR}/chrome_browser.log"
177180
# When running for Zalenium prepare certain customizations
178-
if [ "${ZALENIUM}" == "true" ]; then
179-
export CHROME_ADDITIONAL_ARGS="--user-data-dir=/home/seluser/chrome-user-data-dir"
180-
fi
181+
# if [ "${ZALENIUM}" == "true" ]; then
182+
# export CHROME_ADDITIONAL_ARGS="--user-data-dir=/home/seluser/chrome-user-data-dir"
183+
# fi
181184

182185
# TODO: Remove this duplicated logic
183186
if [ "${SELENIUM_HUB_PORT}" = "0" ]; then

0 commit comments

Comments
 (0)