diff --git a/tasks/docker/docker.yml b/tasks/docker/docker.yml index b901ec4..cbe455c 100644 --- a/tasks/docker/docker.yml +++ b/tasks/docker/docker.yml @@ -174,21 +174,6 @@ stopped: true build: true -- name: Stop mastodon_web_1 container - docker_container: - name: mastodon_web_1 - state: stopped - -- name: Stop mastodon_streaming_1 container - docker_container: - name: mastodon_streaming_1 - state: stopped - -- name: Stop mastodon_sidekiq_1 container - docker_container: - name: mastodon_sidekiq_1 - state: stopped - - name: Start mastodon_redis_1 container docker_container: name: mastodon_redis_1 @@ -213,20 +198,13 @@ chdir: "{{ mastodon_composer_folder }}" when: not mastodon_initial_setup -- name: Start mastodon_web_1 container - docker_container: - name: mastodon_web_1 - state: started - -- name: Start mastodon_streaming_1 container - docker_container: - name: mastodon_streaming_1 - state: started - -- name: Start mastodon_sidekiq_1 container - docker_container: - name: mastodon_sidekiq_1 - state: started +- name: Build Mastodon container to include secrets + community.docker.docker_compose: + project_name: mastodon + project_src: "{{ mastodon_composer_folder }}/" + state: present + stopped: false + build: true - name: Create initial user shell: "docker-compose -f /opt/mastodon/docker-compose.yml run --rm shell bin/tootctl accounts create '{{ mastodon_owner }}' --email '{{ mastodon_owner_email }}' --confirmed --role Owner && echo 'Owner account created' > /var/lib/mastodon_owner_created"