summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2017-03-27 14:08:45 +0200
committerdrebs <drebs@leap.se>2017-04-05 21:12:58 +0200
commit03e794b28db12b26342646d4d4d560d94a96d313 (patch)
tree8a174e1bbef52f337c0eb92eff66372bcecbd222
parent218273f4284ecf2d80def30ae74d92bc99b974b7 (diff)
Use soledad master branch, install curl and git
-rw-r--r--scripts/docker/Dockerfile12
1 files changed, 9 insertions, 3 deletions
diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index 21764d84..7a741e84 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -4,8 +4,6 @@ FROM debian:jessie-backports
RUN apt-get update
-RUN apt-get -y install git
-
# needed to build python twisted module
RUN apt-get -y install libpython2.7-dev
# needed to build python cryptography module
@@ -18,12 +16,20 @@ RUN apt-get -y install libsqlite3-dev
# install pip and tox
RUN apt-get -y install python-pip
+# We need git from backports because it has
+# the "%cI: committer date, strict ISO 8601 format"
+# pretty format which is used by pytest-benchmark
+RUN apt-get -y install -t jessie-backports git
+
+# Use use to show connection to couchdb during CI
+RUN apt-get -y install curl
+
RUN pip install -U pip
RUN pip install tox
# clone repositories
RUN mkdir -p /builds/leap
-RUN git clone -b develop https://0xacab.org/leap/soledad.git /builds/leap/soledad
+RUN git clone https://0xacab.org/leap/soledad.git /builds/leap/soledad
# use tox to install everything needed to run tests
RUN cd /builds/leap/soledad/testing && tox -v -r --notest