Skip to content

Commit

Permalink
Merge pull request #46 from lalet/master
Browse files Browse the repository at this point in the history
Circle ci changes
  • Loading branch information
glatard authored Sep 1, 2017
2 parents d0957ee + 2938664 commit 7f86b4b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ RUN apt-get -y install docker.io \



RUN pip install boutiques pytest

WORKDIR "test"
RUN pip install boutiques pytest pyspark pybids

ENTRYPOINT ["pytest"]
7 changes: 4 additions & 3 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@ machine:

services:
- docker
- privileged: true

dependencies:
cache_directories:
- "~/docker"

override:
- docker build -t bids/example . :
- docker build -t simtool . :
timeout: 21600
- mkdir -p ~/docker; docker save "bids/example" > ~/docker/image.tar
- mkdir -p ~/docker; docker save "simtool" > ~/docker/image.tar

test:
override:
- docker run --rm=false -it -v $PWD:$PWD -w $PWD bids/example ./test
- docker run --rm=false -v /var/run/docker.sock:/var/run/docker.sock -v $PWD:$PWD -w $PWD simtool ./test

0 comments on commit 7f86b4b

Please sign in to comment.