Merge branch 'develop' of ssh://code.eliotberriot.com:2222/funkwhale/api into develop

.gitignore

@@ -65,3 +65,8 @@ tests/.hitch
 mailhog
 
 *.sqlite3
+
+music
+media
+staticfiles
+static

config/settings/common.py

@@ -199,7 +199,7 @@ CRISPY_TEMPLATE_PACK = 'bootstrap3'
 STATIC_ROOT = str(ROOT_DIR('staticfiles'))
 
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#static-url
-STATIC_URL = '/static/'
+STATIC_URL = env("STATIC_URL", default='/static/')
 
 # See: https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#std:setting-STATICFILES_DIRS
 STATICFILES_DIRS = (

demo/demo-user.py

+from funkwhale_api.users.models import User
+
+
+u = User.objects.create(email='demo@demo.com', username='demo', is_staff=True)
+u.set_password('demo')
+u.save()

demo/load-demo-data.sh

+#! /bin/bash
+
+echo "Loading demo data..."
+
+python manage.py migrate --noinput
+
+echo "Creating demo user..."
+
+cat demo/demo-user.py | python manage.py shell --plain
+
+echo "Importing demo tracks..."
+
+python manage.py import_files "/music/**/*.ogg" --recursive --noinput

dev.yml

@@ -4,10 +4,6 @@ services:
     postgres:
       env_file: .env
       image: postgres
-      volumes:
-        # If you are using boot2docker, postgres data has to live in the VM for now until #581 is fixed
-        # for more info see here: https://github.com/boot2docker/boot2docker/issues/581
-        - /data/dev/funkwhale_api/postgres:/var/lib/postgresql/data
 
     redis:
       env_file: .env
@@ -37,8 +33,6 @@ services:
         - .:/app
       ports:
         - "12081"
-      environment:
-        - USE_SAMPLE_TRACK=true
       links:
         - postgres
         - redis

docker-compose.yml

+version: '2'
+services:
+    postgres:
+      image: postgres:9.5
+
+    api:
+      build: .
+      links:
+        - postgres
+        - redis
+      command: ./compose/django/gunicorn.sh
+      env_file: .env
+      volumes:
+        - ./media:/app/funkwhale_api/media
+        - ./staticfiles:/app/staticfiles
+        - ./music:/music
+      ports:
+        - "127.0.0.1:6001:5000"
+
+    redis:
+      image: redis:3.0
+
+    celeryworker:
+      build: .
+      env_file: .env
+      links:
+       - postgres
+       - redis
+      command: celery -A funkwhale_api.taskapp worker -l INFO
+      volumes:
+        - ./media:/app/funkwhale_api/media
+        - ./music:/music
+      environment:
+        - C_FORCE_ROOT=True
+
+    celerybeat:
+      build: .
+      env_file: .env
+      links:
+        - postgres
+        - redis
+      command: celery -A funkwhale_api.taskapp beat -l INFO