Merge branch 'dev' of github.com:Parisson/TimeSide into dev

Parisson · Nov 21, 2019 · 4cea528 · 4cea528
2 parents b9090a1 + 4efb901
commit 4cea528
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -42,7 +42,7 @@ script:
   - if [[ $TEST_TARGET == 'server' ]]; then
        docker-compose -f docker-compose.yml up -d db;
        sleep 20;
-       docker-compose up -d;
+       docker-compose -f docker-compose.yml -f nginx.yml up -d;
        sleep 20;
        docker-compose exec app python manage.py test timeside.server.tests;
     fi

diff --git a/env/cached.yml b/env/cached.yml
@@ -22,7 +22,6 @@ app:
   volumes:
     - ./app:/srv/app:cached
     - ./timeside:/srv/lib/timeside/timeside:cached
-    - ./timeside:/srv/lib/timeside/timeside:cached
     - ./lib/plugins:/srv/lib/plugins:cached
     - ./etc/apt/sources.list:/etc/apt/sources.list:cached
   volumes_from: