roles/music/tasks/import_music.yml

@@ -25,25 +25,11 @@
 
 - name: Import music into Funkwhale
   shell:
-
+    # funkwhale_import_music_directory is the mounted version of tagged
+    # files at previous step
     cmd: "docker-compose run --rm api python manage.py import_files {{ funkwhale_import_library_id }} {{ funkwhale_import_music_directory }} --recursive --noinput --prune"
     chdir: "{{ funkwhale_folder_name }}"
 
-- name: Run funkwhale import container
-  community.docker.docker_compose:
-    project_src: "{{ funkwhale_folder_name }}"
-    files: ["import.yml"]
-    remove_orphans: yes
-    pull: yes
-    recreate: smart
-    state: present
-
-- name: Remove funkwhale import container
-  community.docker.docker_compose:
-    project_src: "{{ funkwhale_folder_name }}"
-    files: ["import.yml"]
-    state: absent
-
 - name: Delete files once imported
   shell:
     cmd: "rm -rf {{ funkwhale_import_music_directory_host }}/*"

roles/music/tasks/main.yml

@@ -41,7 +41,6 @@
     mode: 0644
   loop:
     - docker-compose.yml.j2
-    - import.yml.j2
     - conf.env.j2
     - nginx.conf.j2
 

roles/music/templates/import.yml.j2

@@ -1,16 +0,0 @@
-version: "{{ compose_version }}"
-
-services:
-  api:
-    image: "funkwhale/funkwhale:{{ funkwhale_version }}"
-    container_name: funkwhale_import
-    env_file:
-      - ./conf.env
-    volumes:
-      - "{{ funkwhale_import_music_directory_host }}:{{ funkwhale_import_music_directory }}:ro"
-      - "static:{{ funkwhale_static_root }}"
-      - "frontend:{{ funkwhale_frontend }}"
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-    command: ["python", "manage.py", "import_files", "{{ funkwhale_import_library_id }}", "{{ funkwhale_import_music_directory }}", "--recursive", "--noinput", "--prune"]
-    restart: no

roles/music/vars/main.yml

@@ -1,4 +1,4 @@
-funkwhale_version: 1.1.4
+funkwhale_version: 1.1.2
 funkwhale_api_port: 5000
 funkwhale_nginx_port: 80
 funkwhale_static_root: /static