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

Commit a925f3d

Browse files
committed
Upgrade Ubuntu xenial date to 20160706
1 parent c2a7e7a commit a925f3d

File tree

6 files changed

+10
-5
lines changed

6 files changed

+10
-5
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Note image ids also change after scm-source.json has being updated which trigger
1010
## TBD_DOCKER_TAG
1111
+ Date: TBD_DATE
1212
+ Add OSX support closes #111 #110
13+
+ Upgrade Ubuntu xenial date to 20160706
14+
+ Upgrade Supervisor 4 dev commit date to 20160628
1315
+ Add docs/share-host.md and docs/jenkins.md (WIP)
1416
+ Chore: Add `WORKDIR ${NORMAL_USER_HOME}`
1517
+ Chore: Add `docker exec grid cat HUB_PORT #=> 24444`

CONTRIBUTING.md

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

1414
For repository owners only:
1515

16-
git commit -m "Add OSX support closes #111 #110"
16+
git commit -m "Upgrade Ubuntu xenial date to 20160706"
1717
git tag -d latest #tag latest will be updated from TravisCI
1818
git tag 2.53.1g && git push origin tmp-2.53.1g && git push --tags
1919

Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
###################################################
44
#== Ubuntu xenial is 16.04, i.e. FROM ubuntu:16.04
55
# search for more at https://registry.hub.docker.com/_/ubuntu/tags/manage/
6-
FROM ubuntu:xenial-20160629
6+
FROM ubuntu:xenial-20160706
77
ENV UBUNTU_FLAVOR="xenial" \
8-
UBUNTU_DATE="20160629"
8+
UBUNTU_DATE="20160706"
99

1010
#== Ubuntu wily is 15.10, i.e. FROM ubuntu:15.10
1111
# FROM ubuntu:wily-20151208
@@ -507,13 +507,14 @@ ENV SEL_HOME ${NORMAL_USER_HOME}/selenium
507507
# RUN apt-get update -qqy \
508508
# && apt-get -qqy install \
509509
# supervisor \
510+
# 2016-06-28 commit: 154cb4c84f28ac, version: supervisor-4.0.0.dev0
510511
# 2016-04-11 commit: 3e541a34a4ab74, version: supervisor-4.0.0.dev0
511512
# 2016-03-06 commit: e4a37c6f8d1cb6, version: supervisor-4.0.0.dev0
512513
# 2016-02-01 commit: eb904ccdb3573e, version: supervisor-4.0.0.dev0
513514
# 2015-06-24 commit: b3ad59703b554f, version: supervisor-4.0.0.dev0
514515
# 2015-08-24 commit: 304b4f388d3e3f, supervisor/version.txt: 4.0.0.dev0
515516
# TODO: Upgrade to supervisor stable 4.0 as soon as is released
516-
RUN SHA="3e541a34a4ab741e67ff4406eb2727599903c6e3" \
517+
RUN SHA="154cb4c84f28ac3e0ac1ce5409faea65c15d2d02" \
517518
&& pip install --upgrade \
518519
"https://github.com/Supervisor/supervisor/zipball/${SHA}" \
519520
&& rm -rf /var/lib/apt/lists/*

bin/entry.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ fi
344344
#-------------------------------------------
345345
# So can be consulted later on with:
346346
# docker exec grid cat HUB_PORT #=> 24444
347+
# docker exec grid cat DISPLAY #=> :41
347348
# docker exec selenium_chrome_1 cat FF_PORT #=> 44023
348349
echo "${SELENIUM_HUB_PORT}" > SELENIUM_HUB_PORT
349350
echo "${SELENIUM_HUB_PORT}" > HUB_PORT

test/python_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
from retrying import retry
4242

43-
@retry(stop_max_attempt_number=5, stop_max_delay=5000, wait_fixed=200)
43+
@retry(stop_max_attempt_number=5, stop_max_delay=180100, wait_fixed=200)
4444
def webdriver_connect():
4545
# http://selenium-python.readthedocs.org/en/latest/getting-started.html#using-selenium-with-remote-webdriver
4646
return webdriver.Remote(command_executor=myselenium_hub_url, desired_capabilities=caps)

test/script_scenario_compose_1_1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ echo "#===================================================================="
66

77
# set -e: exit asap if a command exits with a non-zero status
88
# set -x: print each command right before it is executed
9+
# set -u: treat unset variables as an error and exit immediately
910
set -xe
1011

1112
export SELENIUM_HUB_PORT="4444" \

0 commit comments

Comments
 (0)