Skip to content

Fixing #87 (again), #465 and similar ones #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 26, 2017
Merged

Fixing #87 (again), #465 and similar ones #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca7b7e8
Leaving the original commit made in #182 that fixed #87, this time to…
diemol Apr 23, 2017
0849604
Running the tests agains the generated images in the Travis build, no…
diemol Apr 24, 2017
48f8e7e
Removing dbus package.
diemol Apr 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,10 @@ release: tag_major_minor
docker push $(NAME)/standalone-firefox-debug:$(MAJOR_MINOR_PATCH)

test:
./test.sh
./sa-test.sh
./test.sh debug
./sa-test.sh debug
VERSION=$(VERSION) ./test.sh
VERSION=$(VERSION) ./sa-test.sh
VERSION=$(VERSION) ./test.sh debug
VERSION=$(VERSION) ./sa-test.sh debug

.PHONY: \
all \
Expand Down
1 change: 0 additions & 1 deletion NodeBase/Dockerfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ RUN apt-get update -qqy \
&& apt-get -qqy install \
locales \
xvfb \
dbus \
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*

#==============================
Expand Down
9 changes: 4 additions & 5 deletions NodeChrome/Dockerfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,14 @@ COPY generate_config /opt/selenium/generate_config
RUN chmod +x /opt/selenium/generate_config

#=================================
# Chrome Launch Script Modication
# Chrome Launch Script Modification
#=================================
COPY chrome_launcher.sh /opt/google/chrome/google-chrome
RUN chmod +x /opt/google/chrome/google-chrome

RUN chown -R seluser:seluser /opt/selenium

# Following line fixes
# https://github.com/SeleniumHQ/docker-selenium/issues/87
RUN echo "DBUS_SESSION_BUS_ADDRESS=/dev/null" >> /etc/environment
# Following line fixes https://github.com/SeleniumHQ/docker-selenium/issues/87
ENV DBUS_SESSION_BUS_ADDRESS=/dev/null

USER seluser
USER seluser
5 changes: 2 additions & 3 deletions NodeFirefox/Dockerfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ COPY generate_config /opt/selenium/generate_config
RUN chmod +x /opt/selenium/generate_config \
&& chown -R seluser:seluser /opt/selenium

# Following line fixes
# https://github.com/SeleniumHQ/docker-selenium/issues/87
RUN echo "DBUS_SESSION_BUS_ADDRESS=/dev/null" >> /etc/environment
# Following line fixes https://github.com/SeleniumHQ/docker-selenium/issues/87
ENV DBUS_SESSION_BUS_ADDRESS=/dev/null

USER seluser
3 changes: 2 additions & 1 deletion sa-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env bash

DEBUG=''
VERSION=${VERSION:-3.4.0-bismuth}

if [ -n "$1" ] && [ $1 == 'debug' ]; then
DEBUG='-debug'
Expand All @@ -13,7 +14,7 @@ function test_standalone {
BROWSER=$1
echo Starting Selenium standalone-$BROWSER$DEBUG container

SA=$(docker run -d selenium/standalone-$BROWSER$DEBUG:3.4.0-bismuth)
SA=$(docker run -d selenium/standalone-$BROWSER$DEBUG:${VERSION})
SA_NAME=$(docker inspect -f '{{ .Name }}' $SA | sed s:/::)
TEST_CMD="node smoke-$BROWSER.js"

Expand Down
2 changes: 1 addition & 1 deletion test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ echo Building test container image
docker build -t selenium/test:local ./Test

echo 'Starting Selenium Hub Container...'
HUB=$(docker run -d selenium/hub:3.4.0-bismuth)
HUB=$(docker run -d selenium/hub:${VERSION})
HUB_NAME=$(docker inspect -f '{{ .Name }}' $HUB | sed s:/::)
echo 'Waiting for Hub to come online...'
docker logs -f $HUB &
Expand Down