make test works in docker (#2595)

GeoNode · Aug 22, 2016 · 1300d03 · 1300d03
1 parent 69e5b37
commit 1300d03
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -6,11 +6,12 @@ build:
 	docker-compose build django
 	docker-compose build celery
 
-sync:
+sync: up
 	# set up the database tablea
-	docker-compose run django python manage.py makemigrations --noinput
-	docker-compose run django python manage.py migrate account --noinput
-	docker-compose run django python manage.py migrate --noinput
+	docker-compose exec django django-admin.py makemigrations --noinput
+	docker-compose exec django django-admin.py migrate account --noinput
+	docker-compose exec django django-admin.py migrate --noinput
+	docker-compose exec django django-admin.py loaddata sample_admin
 
 wait:
 	sleep 5
@@ -24,11 +25,11 @@ down:
 pull:
 	docker-compose pull
 
-smoketest:
-	docker-compose run django python manage.py test geonode.tests.smoke nosetests geonode.tests.smoke --nocapture --detailed-errors --verbosity=1 --failfast
+smoketest: up
+	docker-compose exec django python manage.py test geonode.tests.smoke --nocapture --detailed-errors --verbosity=1 --failfast
 
-unittest:
-	docker-compose run django python manage.py test geonode.people.tests geonode.base.tests geonode.layers.tests geonode.maps.tests geonode.proxy.tests geonode.security.tests geonode.social.tests geonode.catalogue.tests geonode.documents.tests geonode.api.tests geonode.groups.tests geonode.services.tests geonode.geoserver.tests geonode.upload.tests geonode.tasks.tests --noinput --failfast
+unittest: up
+	docker-compose exec django python manage.py test geonode.people.tests geonode.base.tests geonode.layers.tests geonode.maps.tests geonode.proxy.tests geonode.security.tests geonode.social.tests geonode.catalogue.tests geonode.documents.tests geonode.api.tests geonode.groups.tests geonode.services.tests geonode.geoserver.tests geonode.upload.tests geonode.tasks.tests --noinput --failfast
 
 test: smoketest unittest
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,11 +11,12 @@ services:
      image: rabbitmq
 
   django:
-    image: geonode/django
+    build: .
     links:
       - postgres
       - elasticsearch
       - rabbitmq
+    command: django-admin.py runserver 0.0.0.0:8000 --settings=geonode.settings
     environment:
       - DATABASE_URL=postgres://postgres:postgres@postgres:5432/postgres
       - BROKER_URL=amqp://guest:guest@rabbitmq:5672/
@@ -24,7 +25,7 @@ services:
       - ALLOWED_HOSTS=['django',]
 
   celery:
-    image: geonode/django
+    build: .
     links:
       - rabbitmq
       - postgres