README.md

@@ -30,4 +30,6 @@ For more, see [`docs.coopcloud.tech`](https://docs.coopcloud.tech).
 Before you deploy: `abra app cmd <app> secrets --local`
 
 After you deploy:
-- `abra app cmd -T <app> api admin`
+- `cp -r frontend/* /srv/funkwhale/front/dist`
+- `abra app cmd <app> api migrate`
+- `abra app cmd <app> api admin`

abra.sh

@@ -1,5 +1,5 @@
 export NGINX_CONFIG_VERSION=v2
-export APP_ENTRYPOINT_VERSION=v2
+export APP_ENTRYPOINT_VERSION=v1
 
 secrets() {
   docker context use default > /dev/null 2>&1

compose.yml

@@ -31,26 +31,6 @@ x-volumes: &default-volumes
   - frontend-data:/srv/funkwhale/front/dist:ro
 
 services:
-  api:
-    image: funkwhale/funkwhale:1.2
-    environment: *default-env
-    secrets: *default-secrets
-    volumes:
-    - music-data:/srv/funkwhale/data/music:ro
-    - media-data:/srv/funkwhale/data/media
-    - static-data:/srv/funkwhale/data/static
-    - frontend-data:/app/frontend:ro
-    depends_on:
-      - db
-      - cache
-    configs:
-      - source: app_entrypoint
-        target: /docker-entrypoint.sh
-        mode: 0555
-    entrypoint: /docker-entrypoint.sh
-    command: /app/compose/django/server.sh
-    networks:
-      - internal
   app:
     image: nginx:1.27.1
     environment: *default-env
@@ -106,6 +86,22 @@ services:
     networks:
       - internal
 
+  api:
+    image: funkwhale/funkwhale:1.2
+    environment: *default-env
+    secrets: *default-secrets
+    volumes: *default-volumes
+    depends_on:
+      - db
+      - cache
+    configs:
+      - source: app_entrypoint
+        target: /docker-entrypoint.sh
+        mode: 0555
+    entrypoint: /docker-entrypoint.sh
+    command: /app/compose/django/server.sh
+    networks:
+      - internal
 
   db:
     image: postgres:10-alpine

entrypoint.sh.tmpl

@@ -29,9 +29,6 @@ export DATABASE_URL="postgres://funkwhale:$DATABASE_PASSWORD@db:5432/funkwhale"
 
 file_env "DJANGO_SECRET_KEY"
 
-# migrate before starting
-python manage.py migrate
-
 # upstream entrypoint
 # https://dev.funkwhale.audio/funkwhale/funkwhale/-/blob/develop/api/Dockerfile
 /app/compose/django/entrypoint.sh "$@"