fix: the admin command requires a tty

Reviewed-on: #4
Reviewed-by: decentral1se <decentral1se@noreply.git.coopcloud.tech>

.drone.yml

@@ -36,7 +36,7 @@ steps:
         from_secret: drone_abra-bot_token
       fork: true
       repositories:
-        - coop-cloud/auto-recipes-catalogue-json
+        - toolshed/auto-recipes-catalogue-json
 
 trigger:
   event: tag

.env.sample

@@ -1,5 +1,5 @@
 TYPE=funkwhale
-DOMAIN={{ .Domain }}
+DOMAIN=funkwhale.example.com
 LETS_ENCRYPT_ENV=production
 
 SECRET_DB_PASSWORD_VERSION=v1
@@ -15,7 +15,7 @@ FUNKWHALE_WEB_WORKERS=4
 # Replace this by the definitive, public domain you will use for
 # your instance. It cannot be changed after initial deployment
 # without breaking your instance.
-FUNKWHALE_HOSTNAME={{ .Domain }}
+FUNKWHALE_HOSTNAME=funkwhale.example.com
 FUNKWHALE_PROTOCOL=https
 
 # Log level (debug, info, warning, error, critical)

README.md

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

abra.sh

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

compose.yml

@@ -31,8 +31,28 @@ 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.25.3
+    image: nginx:1.27.1
     environment: *default-env
     volumes: *default-volumes
     configs:
@@ -50,7 +70,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - "coop-cloud.${STACK_NAME}.version=0.1.0+1.25.3"
+        - "coop-cloud.${STACK_NAME}.version=0.1.1+1.27.1"
 
   celeryworker:
     image: funkwhale/funkwhale:1.2
@@ -86,22 +106,6 @@ 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,6 +29,9 @@ 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 "$@"