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

Commit a527f23

Browse files
committed
Remove haveged
Since there is already another workaround for Java's randomness "problem", don't add another layer of complexity.
1 parent b0925b8 commit a527f23

File tree

3 files changed

+2
-36
lines changed

3 files changed

+2
-36
lines changed

Dockerfile

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ ENV DEBIAN_FRONTEND=noninteractive \
7474
RUN apt -qqy update \
7575
&& apt -qqy install \
7676
libltdl7 \
77-
libhavege1 \
7877
netcat-openbsd \
7978
pwgen \
8079
bc \
@@ -154,25 +153,8 @@ RUN useradd seluser \
154153
RUN apt -qqy update \
155154
&& apt -qqy install \
156155
openjdk-8-jre-headless \
157-
&& sed -i 's/securerandom.source=file:\/dev\/urandom/securerandom.source=file:\/dev\/.\/urandom/g' \
158-
/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/java.security \
159-
&& sed -i 's/securerandom.source=file:\/dev\/random/securerandom.source=file:\/dev\/.\/urandom/g' \
160-
/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/java.security \
161-
&& apt -qyy autoremove \
162-
&& rm -rf /var/lib/apt/lists/* \
163-
&& apt -qyy clean
164-
165-
#==============================================
166-
# Java blocks until kernel have enough entropy
167-
# to generate the /dev/random seed
168-
#==============================================
169-
# See: SeleniumHQ/docker-selenium/issues/14
170-
RUN apt -qqy update \
171-
&& apt-key update -qqy \
172-
&& apt -qqy install \
173-
haveged rng-tools \
174-
&& service haveged start \
175-
&& update-rc.d haveged defaults \
156+
&& sed -i '/securerandom.source=/ s|/dev/u?random|/dev/./urandom|g' \
157+
/etc/java-*/security/java.security \
176158
&& apt -qyy autoremove \
177159
&& rm -rf /var/lib/apt/lists/* \
178160
&& apt -qyy clean

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,6 @@ If your tests crashes in Chrome you may need to increase shm size or simply star
243243

244244
docker run ... -v /dev/shm:/dev/shm --privileged ...
245245

246-
We also found recently that when missing `--privileged` haveged will break: `haveged: RNDADDENTROPY failed!`
247-
248246
### Firefox crashed
249247

250248
Same as Chrome, people have [reported](https://goo.gl/5UzpDq) the shm fix might also be necessary for Firefox.

bin/entry.sh

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,6 @@ if [ ${CURRENT_GID} -ne 1000 ]; then
5656
fi
5757
fi
5858

59-
#==============================================
60-
# Java blocks until kernel have enough entropy
61-
# to generate the /dev/random seed
62-
#==============================================
63-
# See: SeleniumHQ/docker-selenium/issues/14
64-
# Added a non-sudo conditional so this works on non-sudo environments like K8s
65-
if [ "${WE_HAVE_SUDO_ACCESS}" == "true" ]; then
66-
# We found that, for better entropy, running haveged
67-
# with --privileged and sudo here works more reliable
68-
sudo -E haveged || true
69-
else
70-
haveged || true
71-
fi
72-
7359
# Workaround that might help to get dbus working in docker
7460
# http://stackoverflow.com/a/38355729/511069
7561
# https://github.com/SeleniumHQ/docker-selenium/issues/87#issuecomment-187659234

0 commit comments

Comments
 (0)