Skip to content

Commit 69707f0

Browse files
committed
use ff version 52.0.2; install dbus to fix dbus issues; correct containers; update to cesium; add debug to hub config; add role to hub config; fix comma-separated json values
1 parent b25ff13 commit 69707f0

File tree

25 files changed

+67
-52
lines changed

25 files changed

+67
-52
lines changed

Hub/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/base:3.3.1-bohrium
5+
FROM selenium/base:3.3.1-cesium
66
MAINTAINER Selenium <[email protected]>
77

88
#========================
@@ -25,6 +25,8 @@ ENV GRID_CLEAN_UP_CYCLE 5000
2525
ENV GRID_BROWSER_TIMEOUT 0
2626
# In seconds, maps to "timeout"
2727
ENV GRID_TIMEOUT 30
28+
# Debug
29+
ENV GRID_DEBUG false
2830

2931
COPY generate_config /opt/selenium/generate_config
3032
COPY entry_point.sh /opt/bin/entry_point.sh
@@ -33,4 +35,4 @@ RUN chown -R seluser /opt/selenium
3335

3436
USER seluser
3537

36-
CMD ["/opt/bin/entry_point.sh"]
38+
CMD ["/opt/bin/entry_point.sh"]

Hub/Dockerfile.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ ENV GRID_CLEAN_UP_CYCLE 5000
2020
ENV GRID_BROWSER_TIMEOUT 0
2121
# In seconds, maps to "timeout"
2222
ENV GRID_TIMEOUT 30
23+
# Debug
24+
ENV GRID_DEBUG false
2325

2426
COPY generate_config /opt/selenium/generate_config
2527
COPY entry_point.sh /opt/bin/entry_point.sh
@@ -28,4 +30,4 @@ RUN chown -R seluser /opt/selenium
2830

2931
USER seluser
3032

31-
CMD ["/opt/bin/entry_point.sh"]
33+
CMD ["/opt/bin/entry_point.sh"]

Hub/generate_config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ echo "
44
{
55
\"host\": null,
66
\"port\": 4444,
7+
\"role\": \"hub\",
78
\"maxSession\": $GRID_MAX_SESSION,
89
\"newSessionWaitTimeout\": $GRID_NEW_SESSION_WAIT_TIMEOUT,
910
\"capabilityMatcher\": \"org.openqa.grid.internal.utils.DefaultCapabilityMatcher\",
@@ -12,5 +13,5 @@ echo "
1213
\"cleanUpCycle\": $GRID_CLEAN_UP_CYCLE,
1314
\"browserTimeout\": $GRID_BROWSER_TIMEOUT,
1415
\"timeout\": $GRID_TIMEOUT,
15-
\"prioritizer\": null,
16-
}"
16+
\"debug\": $GRID_DEBUG
17+
}"

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
NAME := selenium
2-
VERSION := $(or $(VERSION),$(VERSION),3.3.1-bohrium)
2+
VERSION := $(or $(VERSION),$(VERSION),3.3.1-cesium)
33
PLATFORM := $(shell uname -s)
44
BUILD_ARGS := $(BUILD_ARGS)
55
MAJOR := $(word 1,$(subst ., ,$(VERSION)))

NodeBase/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/base:3.3.1-bohrium
5+
FROM selenium/base:3.3.1-cesium
66
MAINTAINER Selenium <[email protected]>
77

88
ENV DEBIAN_FRONTEND noninteractive
@@ -15,6 +15,7 @@ RUN apt-get update -qqy \
1515
&& apt-get -qqy install \
1616
locales \
1717
xvfb \
18+
dbus \
1819
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
1920

2021
#==============================
@@ -36,4 +37,4 @@ ENV DISPLAY :99.0
3637

3738
USER seluser
3839

39-
CMD ["/opt/bin/entry_point.sh"]
40+
CMD ["/opt/bin/entry_point.sh"]

NodeBase/Dockerfile.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ RUN apt-get update -qqy \
1010
&& apt-get -qqy install \
1111
locales \
1212
xvfb \
13+
dbus \
1314
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
1415

1516
#==============================
@@ -31,4 +32,4 @@ ENV DISPLAY :99.0
3132

3233
USER seluser
3334

34-
CMD ["/opt/bin/entry_point.sh"]
35+
CMD ["/opt/bin/entry_point.sh"]

NodeChrome/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/node-base:3.3.1-bohrium
5+
FROM selenium/node-base:3.3.1-cesium
66
MAINTAINER Selenium <[email protected]>
77

88
USER root

NodeChrome/generate_config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ echo "
1717
\"maxSession\": $NODE_MAX_SESSION,
1818
\"port\": $NODE_PORT,
1919
\"register\": true,
20-
\"registerCycle\": $NODE_REGISTER_CYCLE
20+
\"registerCycle\": $NODE_REGISTER_CYCLE,
2121
\"nodePolling\": $NODE_POLLING,
2222
\"unregisterIfStillDownAfter\": $NODE_UNREGISTER_IF_STILL_DOWN_AFTER,
2323
\"downPollingLimit\": $NODE_DOWN_POLLING_LIMIT
24-
}"
24+
}"

NodeChromeDebug/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/node-chrome:3.3.1-bohrium
5+
FROM selenium/node-chrome:3.3.1-cesium
66
MAINTAINER Selenium <[email protected]>
77

88
USER root

NodeChromeDebug/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
3838
When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it:
3939

4040
``` dockerfile
41-
FROM selenium/node-chrome-debug:3.3.1-bohrium
41+
FROM selenium/node-chrome-debug:3.3.1-cesium
4242

4343
RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
4444
```

0 commit comments

Comments
 (0)