From c6e9755494181283703010cd53bbf59ec9613e38 Mon Sep 17 00:00:00 2001
From: "Antonio J. Delgado" <ad@susurrando.com>
Date: Sun, 30 Jul 2023 16:27:15 +0300
Subject: [PATCH] Use docker-compose override

---
 tasks/docker/docker.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tasks/docker/docker.yml b/tasks/docker/docker.yml
index 0dd2a74..920a61f 100644
--- a/tasks/docker/docker.yml
+++ b/tasks/docker/docker.yml
@@ -32,7 +32,7 @@
 - name: Create docker-compose.yaml file
   template:
     src: templates/docker-compose.yml.j2
-    dest: "{{ mastodon_composer_folder }}/docker-compose.yml"
+    dest: "{{ mastodon_composer_folder }}/docker-compose.override.yml"
     backup: true
 
 - name: Ensure mastodon environment configuration is present
@@ -165,14 +165,14 @@
 
 # CREATE USER mastodon CREATEDB;
 - name: Set up database
-  shell: "docker-compose -f '{{ mastodon_composer_folder }}/docker-compose.yml' run --rm web bundle exec rake db:setup && echo 'Database ready' > /var/lib/mastodon_db_setup"
+  shell: "docker-compose run --rm web bundle exec rake db:setup && echo 'Database ready' > /var/lib/mastodon_db_setup"
   args:
     creates: /var/lib/mastodon_db_setup
     chdir: "{{ mastodon_composer_folder }}"
   when: mastodon_initial_setup
 
 - name: Migrate database
-  shell: "docker-compose -f '{{ mastodon_composer_folder }}/docker-compose.yml' run --rm web bundle exec rake db:migrate && echo 'Database migrated' > /var/lib/mastodon_db_migrated"
+  shell: "docker-compose run --rm web bundle exec rake db:migrate && echo 'Database migrated' > /var/lib/mastodon_db_migrated"
   args:
     creates: /var/lib/mastodon_db_migrated
     chdir: "{{ mastodon_composer_folder }}"
@@ -187,7 +187,7 @@
     build: true
 
 - name: Create initial user
-  shell: "docker-compose -f /opt/mastodon/docker-compose.yml run --rm web bin/tootctl accounts create '{{ mastodon_owner }}' --email '{{ mastodon_owner_email }}' --confirmed --role Owner && echo 'Owner account created' > /var/lib/mastodon_owner_created"
+  shell: "docker-compose run --rm web bin/tootctl accounts create '{{ mastodon_owner }}' --email '{{ mastodon_owner_email }}' --confirmed --role Owner && echo 'Owner account created' > /var/lib/mastodon_owner_created"
   args:
     creates: /var/lib/mastodon_owner_created
     chdir: "{{ mastodon_composer_folder }}"