summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorVarac <varac@leap.se>2017-11-22 10:35:21 +0100
committerKali Kaneko <kali@leap.se>2017-11-23 16:14:34 +0100
commit4bd7eb76924ce3c89c624736ecf31f5f9129899a (patch)
tree0aba3198fa65e791126725d17e4e98ed29b18d12 /tests
parent33f46a7ac2ec631303520fce1cd693363d28bab9 (diff)
[test] Ship and install latest chromedriver 2.33
I tried to upgrade to ubuntu packages chromedriver 2.32 (artful) but this didn't help. After using latest chromedriver release 2.33 from https://sites.google.com/a/chromium.org/chromedriver/downloads it works. Also, build docker image from LEAP/artful. Resolves: #9149
Diffstat (limited to 'tests')
-rw-r--r--tests/docker/Dockerfile30
1 files changed, 18 insertions, 12 deletions
diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile
index 876ba1d4..6451b6f6 100644
--- a/tests/docker/Dockerfile
+++ b/tests/docker/Dockerfile
@@ -1,19 +1,25 @@
-# start with a fresh image (that comes from Ubuntu 16.04 at the moment).
-
-FROM 0xacab.org:4567/leap/bitmask-dev:latest
+FROM 0xacab.org:4567/leap/docker/ubuntu:artful_amd64
MAINTAINER LEAP Encryption Access Project <info@leap.se>
-LABEL Description="Image for building bitmask-dev based on Ubuntu 16:04" Vendor="LEAP" Version="1.0"
-
-RUN apt-get update
+LABEL Description="Image for building bitmask-dev based on Ubuntu 17:10" Vendor="LEAP" Version="1.0"
# Install bitmask-dev build and test deps
-RUN apt-get -y install build-essential python-virtualenv libpython-dev \
- libsqlcipher-dev libssl-dev libffi-dev python-pyqt5 python-pyqt5.qtwebkit \
- nodejs npm nodejs-legacy mocha \
+RUN apt-get update && \
+ apt-get -y install --no-install-recommends \
+ build-essential python-virtualenv libpython-dev \
+ libsqlcipher-dev libssl-dev libffi-dev \
+ python-pyqt5 python-pyqt5.qtwebkit \
+ nodejs mocha \
git swaks uuid-runtime \
openvpn policykit-1 lxpolkit \
wget patchelf libusb-0.1-4 \
- docker.io \
- xvfb chromium-chromedriver
-RUN ln -s /usr/lib/chromium-browser/chromedriver /usr/local/bin/chromedriver
+ xvfb \
+ # needed for chromedriver
+ libgconf-2-4 chromium-browser unzip
+
+WORKDIR /tmp
+RUN wget https://chromedriver.storage.googleapis.com/2.33/chromedriver_linux64.zip && \
+ unzip chromedriver_linux64.zip && \
+ cp chromedriver /usr/local/bin
+
+RUN /usr/local/bin/chromedriver --version