diff --git a/README.md b/README.md index 2ac6cd8b96304b29fb597de5e11d448e70babb69..7efd642b423f1fae4ee6c72d681040a75adf87c9 100644 --- a/README.md +++ b/README.md @@ -10,4 +10,9 @@ Set up a service using Docker Compose `compose_service_run_prune` If prune should be run after deploying (on by default) `compose_service_registry_url` (optional) Custom registry URL `compose_service_registry_username` (optional) Custom registry credentials -`compose_service_registry_password` (optional) Custom registry credentials \ No newline at end of file +`compose_service_registry_password` (optional) Custom registry credentials + +### Contributors + +- Fachschaft Informatik, TU Dortmund +- Rhein-Ruhr Systemtechnik GmbH, Bochum \ No newline at end of file diff --git a/handlers/main.yml b/handlers/main.yml deleted file mode 100644 index 30dc9073a609ad2f4cdc84a4c73be822899a5fc2..0000000000000000000000000000000000000000 --- a/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for compose_service diff --git a/meta/main.yml b/meta/main.yml index 71dcef8da4a4c0abbc4c2c40e65a3409b5581bfd..e228d1f3366c351046a50429b1b2d1add3c4e197 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -8,5 +8,8 @@ galaxy_info: - name: Ubuntu versions: - all + - name: Debian + versions: + - all dependencies: - role: geerlingguy.docker diff --git a/tasks/main.yml b/tasks/main.yml index e33cd49f66fab175d3bb2f4f304fe4f904c0a091..d62ca7fa3748d7d40bb824fc2fb0f39e29f8bc38 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -26,25 +26,13 @@ password: "{{ compose_service_registry_password }}" when: compose_service_registry_url is defined -- name: Validate compose file - ansible.builtin.command: - cmd: docker compose --file docker-compose.yml config --quiet - chdir: /opt/{{ compose_service_name }} - changed_when: false - - name: Pull container images - ansible.builtin.command: - cmd: docker compose --ansi never --progress plain --file docker-compose.yml pull - chdir: /opt/{{ compose_service_name }} - register: temp_compose_pull - changed_when: "'Downloading' in temp_compose_pull.stdout" + community.docker.docker_compose_v2_pull: + project_src: /opt/{{ compose_service_name }} - name: Start containers - ansible.builtin.command: - cmd: docker compose --ansi never --progress plain --file docker-compose.yml up --detach - chdir: /opt/{{ compose_service_name }} - register: temp_compose_up - changed_when: "'Started' in temp_compose_up.stdout" + community.docker.docker_compose_v2: + project_src: /opt/{{ compose_service_name }} - name: Prune unused and dangling images & containers community.docker.docker_prune: