diff options
| author | drebs <drebs@leap.se> | 2016-07-25 11:39:38 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2016-08-01 21:09:03 -0300 |
| commit | 1a8ea1fde14eb5b2d2c4d4165c4bc21031512d06 (patch) | |
| tree | e4a7936995f690d22e5ac6c2d0b8ba3552cbef19 | |
| parent | 8d08016b6e5985569ca5d04ef3e2690e78809f54 (diff) | |
[test] use docker image with couchdb service to run tests
| -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 |