Merge pull request #30 from ppodgorsek/issue-18

Issue #18 - Allow to define the screen resolution as an environment variable

Author: ppodgorsek

Dockerfile

@@ -6,14 +6,18 @@ LABEL description Robot Framework in Docker.
 VOLUME /opt/robotframework/reports
 VOLUME /opt/robotframework/tests
 
+ENV SCREEN_COLOUR_DEPTH 24
+ENV SCREEN_HEIGHT 1080
+ENV SCREEN_WIDTH 1920
+
 RUN dnf upgrade -y\
 	&& dnf install -y\
 		chromedriver-61.0.3163.100-1.fc26\
 		chromium-61.0.3163.100-1.fc26\
 		firefox-57.0-2.fc26\
 		python2-pip-9.0.1-9.fc26\
-		xorg-x11-server-Xvfb-1.19.3-4.fc26\
 		which-2.21-2.fc26\
+		xorg-x11-server-Xvfb-1.19.3-4.fc26\
 	&& dnf clean all
 
 RUN pip install robotframework==3.0.2\
@@ -23,12 +27,12 @@ ADD drivers/geckodriver-v0.18.0-linux64.tar.gz /opt/robotframework/drivers/
 
 COPY bin/chromedriver.sh /opt/robotframework/bin/chromedriver
 COPY bin/chromium-browser.sh /opt/robotframework/bin/chromium-browser
+COPY bin/run-tests-in-virtual-screen.sh /opt/robotframework/bin/
 
 # FIXME: below is a workaround, as the path is ignored
 RUN mv /usr/lib64/chromium-browser/chromium-browser /usr/lib64/chromium-browser/chromium-browser-original\
 	&& ln -sfv /opt/robotframework/bin/chromium-browser /usr/lib64/chromium-browser/chromium-browser
 
 ENV PATH=/opt/robotframework/bin:/opt/robotframework/drivers:$PATH
 
-ENTRYPOINT ["xvfb-run", "--server-args=-screen 0 1920x1080x24 -ac", "robot", "--outputDir", "/opt/robotframework/reports", "/opt/robotframework/tests"]
-
+CMD ["run-tests-in-virtual-screen.sh"]

README.md

@@ -17,8 +17,8 @@ The versions used in the latest version are:
 
 * Robot Framework 3.0.2
 * Robot Framework selenium2library 1.8.0
-* Firefox 55.0
-* Chromium 60.0
+* Firefox 57.0
+* Chromium 61.0
 
 ## Running the container
 
@@ -33,3 +33,11 @@ This container can be run using the following command:
 Browsers can be easily switched. It is recommended to define `${BROWSER} %{BROWSER}` in your Robot variables and to use `${BROWSER}` in your test cases. This allows to set the browser in a single place if needed.
 
 When running your tests, simply add `-e BROWSER=chrome` or `-e BROWSER=firefox` to the run command.
+
+### Changing the container screen's resolution
+
+It is possible to define the settings of the virtual screen in which the browser is run by changing several environment variables:
+
+* `SCREEN_COLOUR_DEPTH` (default: 24)
+* `SCREEN_HEIGHT` (default: 1080)
+* `SCREEN_WIDTH` (default: 1920)

bin/run-tests-in-virtual-screen.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+xvfb-run --server-args="-screen 0 ${SCREEN_WIDTH}x${SCREEN_HEIGHT}x${SCREEN_COLOUR_DEPTH} -ac" robot --outputDir /opt/robotframework/reports /opt/robotframework/tests