diff --git a/update_minecraft.yml b/update_minecraft.yml index 7324701..63cb84c 100644 --- a/update_minecraft.yml +++ b/update_minecraft.yml @@ -91,22 +91,21 @@ remote_src: true mode: "0600" - - name: Pull latest Minecraft images - community.docker.docker_compose_v2: - project_name: "{{ mc_project }}" - project_src: "{{ compose_remote_dir }}" - files: - - "{{ mc_compose_filename }}" - pull: always + - name: Pull latest Minecraft images (docker compose) + ansible.builtin.command: > + docker compose + -p {{ mc_project }} + -f {{ compose_remote_dir }}/{{ mc_compose_filename }} + pull + changed_when: false - - name: Recreate Minecraft stack - community.docker.docker_compose_v2: - project_name: "{{ mc_project }}" - project_src: "{{ compose_remote_dir }}" - files: - - "{{ mc_compose_filename }}" - state: present - recreate: always + - name: Recreate Minecraft stack (docker compose up) + ansible.builtin.command: > + docker compose + -p {{ mc_project }} + -f {{ compose_remote_dir }}/{{ mc_compose_filename }} + up -d --remove-orphans --force-recreate + changed_when: false - name: Wait for Minecraft port ansible.builtin.wait_for: @@ -114,17 +113,11 @@ port: "{{ mc_port }}" timeout: 180 - - name: Wait until server reports "Done" in logs (ready) - community.docker.docker_container_logs: - container: "{{ mc_container_name }}" - tail: 200 - register: mc_logs + - name: Wait until server reports "Done" in docker logs (ready) + ansible.builtin.command: > + docker logs --tail 200 {{ mc_container_name }} + register: mc_docker_logs retries: 60 delay: 5 - until: > - (mc_logs.logs is defined) and - ( - 'Done (' in mc_logs.logs or - 'Done (' in (mc_logs.log | default('')) - ) + until: "'Done (' in mc_docker_logs.stdout" changed_when: false