Skip to content

Commit 23eea4a

Browse files
authored
Merge pull request #17 from ppodgorsek/issue-16
Issue #16 - Update the base image to the latest Fedora version
2 parents b06cdab + d117d3d commit 23eea4a

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

Dockerfile

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
1-
FROM fedora:25
1+
FROM fedora:26
22

33
MAINTAINER Paul Podgorsek <[email protected]>
44
LABEL description Robot Framework in Docker.
55

66
VOLUME /opt/robotframework/reports
77
VOLUME /opt/robotframework/tests
88

9-
COPY dnf/google-chrome.repo /etc/yum.repos.d/google-chrome.repo
10-
119
RUN dnf upgrade -y\
1210
&& dnf install -y\
13-
chromedriver-59.0.3071.104-1.fc25\
14-
firefox-54.0-2.fc25\
15-
google-chrome-stable-59.0.3071.115-1\
16-
python-pip-8.1.2-2.fc25\
17-
xorg-x11-server-Xvfb-1.19.3-1.fc25\
11+
chromedriver-59.0.3071.104-1.fc26\
12+
chromium-59.0.3071.104-1.fc26\
13+
firefox-54.0-2.fc26\
14+
python2-pip-9.0.1-9.fc26\
15+
xorg-x11-server-Xvfb-1.19.3-4.fc26\
16+
which-2.21-2.fc26\
1817
&& dnf clean all
1918

2019
RUN pip install robotframework==3.0.2\
2120
robotframework-selenium2library==1.8.0
2221

23-
ADD drivers/geckodriver-v0.13.0-linux64.tar.gz /opt/robotframework/drivers/
22+
ADD drivers/geckodriver-v0.18.0-linux64.tar.gz /opt/robotframework/drivers/
2423

25-
COPY bin/google-chrome.sh /opt/robotframework/bin/google-chrome
24+
COPY bin/chromedriver.sh /opt/robotframework/bin/chromedriver
25+
COPY bin/chromium-browser.sh /opt/robotframework/bin/chromium-browser
2626

2727
# FIXME: below is a workaround, as the path is ignored
28-
RUN mv /opt/google/chrome/google-chrome /opt/google/chrome/google-chrome-original\
29-
&& ln -sfv /opt/robotframework/bin/google-chrome /opt/google/chrome/google-chrome
28+
RUN mv /usr/lib64/chromium-browser/chromium-browser /usr/lib64/chromium-browser/chromium-browser-original\
29+
&& ln -sfv /opt/robotframework/bin/chromium-browser /usr/lib64/chromium-browser/chromium-browser
3030

3131
ENV PATH=/opt/robotframework/bin:/opt/robotframework/drivers:$PATH
3232

3333
ENTRYPOINT ["xvfb-run", "--server-args=-screen 0 1920x1080x24 -ac", "robot", "--outputDir", "/opt/robotframework/reports", "/opt/robotframework/tests"]
34+

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The versions used in the latest version are:
1818
* Robot Framework 3.0.2
1919
* Robot Framework selenium2library 1.8.0
2020
* Firefox 54.0
21-
* Google Chrome 59.0
21+
* Chromium 59.0
2222

2323
## Running the container
2424

bin/chromedriver.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
3+
/usr/bin/chromedriver --verbose --log-path=/var/log/chromedriver --no-sandbox $@
4+

bin/chromium-browser.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
3+
/usr/lib64/chromium-browser/chromium-browser-original --disable-gpu --no-sandbox $@
4+

bin/google-chrome.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

dnf/google-chrome.repo

Lines changed: 0 additions & 6 deletions
This file was deleted.
-1.72 MB
Binary file not shown.
2.16 MB
Binary file not shown.

0 commit comments

Comments
 (0)