Commit f8221698 authored by Guillaume Pellerin's avatar Guillaume Pellerin
Browse files

Merge branch 'dev'

parents 64f671a4 96caaf64
......@@ -19,7 +19,7 @@ install:
script:
- docker-compose run app pip freeze
- docker-compose -f docker-compose.yml -f env/staging.yml up -d
- docker-compose -f docker-compose.yml -f env/build.yml up -d
- docker-compose run app python manage.py test
- sleep 180
- curl --fail --retry 10 --retry-delay 5 -v "$(docker-compose port nginx 8040)/"
......
Subproject commit 2929e4d62663ee10394b1dae25c239399a2ec0a7
Subproject commit 218b5fdc80720d59f63267d21fc2d5da947ebe6e
Subproject commit 07b947a10d774521d0ea6ff603526b9d21caf613
Subproject commit 238051746598a58abc46b0ff055dea53d44cffdb
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment