Merge master for RC

[laas.git] / Makefile

diff --git a/Makefile b/Makefile
index cc7f70a..eccb215 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ build:
        docker-compose -f docker-compose.yml -f docker-compose.override-dev.yml build
 
 dev-up:
-       docker-compose -f docker-compose.yml -f docker-compose.override-dev.yml up -d
+       docker-compose -f docker-compose.yml -f docker-compose.override-dev.yml up
 
 dev-start:
        docker-compose -f docker-compose.yml -f docker-compose.override-dev.yml start
@@ -22,7 +22,7 @@ stop:
        docker-compose stop
 
 data:
-       docker volume create --name=pharos-data
+       docker volume create --name=laas-data
 
 shell-nginx:
        docker exec -ti ng01 bash