Commit 140819a6 authored by BERJON Matthieu's avatar BERJON Matthieu

Merge conflict resolution

Signed-off-by: BERJON Matthieu's avatarMatthieu Berjon <matthieu.berjon@inria.fr>
parent 37727153
...@@ -22,7 +22,6 @@ services: ...@@ -22,7 +22,6 @@ services:
user: "$DOCKERUSER" user: "$DOCKERUSER"
ports: ports:
- "8008:8000" - "8008:8000"
- "8080:8080"
#command: "python3 manage.py runserver 0.0.0.0:8000" #command: "python3 manage.py runserver 0.0.0.0:8000"
volumes: volumes:
- "/data/dev/django:/vol" - "/data/dev/django:/vol"
......
Markdown is supported
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