Merge branch 'feature/docker-compose' of github.com:Parisson/TimeSide into feature...

diff --cc docker-compose.yml
index 6162e318e08cce10498aebd01b62e40ec67f5ab0,922c385254d80f2046088bf2044a2d326146aa1a..141e3a7a2e4332efad803a23cc074a30cd5168a3
--- 1/docker-compose.yml
--- 2/docker-compose.yml
+++ b/docker-compose.yml
@@@ -32,14 -32,11 +32,11 @@@ nginx
    image: nginx
    ports:
      - "8000:80"
-     - "8001:443"
    volumes:
      - ./examples/deploy/nginx/sites-enabled/app.conf:/etc/nginx/conf.d/default.conf
-     - /media
-     #- ./examples/deploy/static/:/var/www/static
    volumes_from:
      - datastatic
 -    - datamedia 
 +    - datamedia
    links:
      - app