diff options
| -rw-r--r-- | .gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | scripts/docker/Dockerfile | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 647cc43c..2835e5cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,6 @@ -trial: +tests: + image: leap/soledad:1.0 + services: + - couchdb script: - - cd testing; tox + - cd testing; tox -- --couch-url http://couchdb:5984 diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile index 2ec310a9..1e46fda3 100644 --- a/scripts/docker/Dockerfile +++ b/scripts/docker/Dockerfile @@ -4,13 +4,16 @@ FROM debian 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 RUN apt-get -y install libssl-dev +RUN apt-get -y install libffi-dev # install pip and tox RUN apt-get -y install python-pip + RUN pip install -U pip RUN pip install tox |