Merge pull request #469 from diemol/master

Fixing #87 (again), #465 and similar ones
SeleniumHQ · Apr 26, 2017 · c256bbb · c256bbb
2 parents ebf037b + 48f8e7e
commit c256bbb
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -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 \

diff --git a/NodeBase/Dockerfile.txt b/NodeBase/Dockerfile.txt
@@ -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/*
 
 #==============================

diff --git a/NodeChrome/Dockerfile.txt b/NodeChrome/Dockerfile.txt
@@ -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
diff --git a/NodeFirefox/Dockerfile.txt b/NodeFirefox/Dockerfile.txt
@@ -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
diff --git a/sa-test.sh b/sa-test.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 DEBUG=''
+VERSION=${VERSION:-3.4.0-bismuth}
 
 if [ -n "$1" ] && [ $1 == 'debug' ]; then
   DEBUG='-debug'
@@ -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"
 

diff --git a/test.sh b/test.sh
@@ -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 &