Merge pull request #20 from pierotofy/docker_chmod_x

Added chmod +x command to docker

Dockerfile

@@ -29,3 +29,6 @@ WORKDIR /webodm/nodeodm/external/node-OpenDroneMap
 RUN npm install
 
 WORKDIR /webodm
+
+# Make sure all scripts are executable
+RUN chmod +x *.sh

README.md

@@ -16,6 +16,7 @@ The quickest way to get started is by using Docker.
 ```
 git clone https://github.com/OpenDroneMap/WebODM
 cd WebODM
+pip install docker-compose
 docker-compose up
 ```
 

docker-compose.yml

@@ -8,7 +8,7 @@ services:
   webapp:
     build: .
     container_name: webapp
-    entrypoint: /bin/bash /webodm/wait-for-it.sh db:5432 -- /webodm/start.sh
+    entrypoint: /bin/bash -c "chmod +x /webodm/*.sh && /webodm/wait-for-it.sh db:5432 -- /webodm/start.sh"
     volumes:
       - .:/webodm
     ports:

start.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
-if ! [ -a .initialized ]; then
-    echo First run, migrating...
-    python manage.py migrate
+echo Running migrations
+python manage.py makemigrations
+python manage.py migrate
 
-    echo Creating default superuser...
-    echo "from django.contrib.auth.models import User; User.objects.create_superuser('admin', 'admin@example.com', 'admin')" | python manage.py shell
-    touch .initialized
-fi
+echo Creating default superuser...
+
+# This will fail if the user is a duplicate
+echo "from django.contrib.auth.models import User; User.objects.create_superuser('admin', 'admin@example.com', 'admin')" | python manage.py shell
 
 python manage.py runserver 0.0.0.0:8000