Commit 37fe7f7f authored by Emilie's avatar Emilie
Browse files

Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev

parents 886aa7dc c32548fc
......@@ -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 08d3ecfc6f651c233f0f5c98113303e2fbdbc1b1
Subproject commit 00c343deceb5036a55bf91b1dd19f04e82173dea
......@@ -53,6 +53,8 @@ app:
- var
expose:
- "8000"
ports:
- "9000:8000"
links:
- db
environment:
......
app:
build: .
app:
build: .
image: ircamweb/mezzo:latest-dev
command: /bin/sh bin/app.sh --runserver
ports:
- "9040:8000"
- "9000:8000"
environment:
- DEBUG=True
nginx:
image: nginx
ports:
- "8000:80"
volumes:
- ./etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
volumes_from:
- var
links:
- app
......@@ -2,13 +2,3 @@
app:
command: /bin/sh bin/app.sh
nginx:
image: nginx
ports:
- "8040:80"
volumes:
- ./etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
volumes_from:
- var
links:
- app
app:
build: .
command: /bin/sh bin/app.sh
nginx:
image: nginx
ports:
- "8040:80"
volumes:
- ./etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
volumes_from:
- var
links:
- app
- "8040:8000"
Subproject commit 5520a2a1c2d252f4c52dcdea3431a620bca1b626
Subproject commit a567596002b1be24c54518b8d36eff2569a48a95
Subproject commit 09c4c7c45efc85e4ff025902478bd34b7e3e71dc
Subproject commit d1c42a926837913bbbe0aa0d30a6599556e997bc
Subproject commit 898aa3f81cb3db53992a77f0425f34f2cd8f7670
Subproject commit 0178b88b49e3999015fce7524961877321a24878
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