From ebcaefd672a28f224b8cbd42eb22676f799e3808 Mon Sep 17 00:00:00 2001 From: micafer Date: Thu, 11 Jan 2024 11:08:44 +0100 Subject: [PATCH 1/5] Fix test --- .github/workflows/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index d92aa1c..2219850 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -32,7 +32,7 @@ jobs: python-version: '3.x' - name: Install test dependencies. - run: pip3 install ansible molecule[docker] docker + run: pip3 install ansible molecule-plugins[docker] docker - name: Run Molecule tests. run: molecule test From c8174bdfc99bcbe5ae8f51a2d43c2eb10269d293 Mon Sep 17 00:00:00 2001 From: micafer Date: Thu, 11 Jan 2024 11:12:57 +0100 Subject: [PATCH 2/5] Replace include with include_tasks --- tasks/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/docker.yml b/tasks/docker.yml index 6b2c0e3..c7b9d9b 100644 --- a/tasks/docker.yml +++ b/tasks/docker.yml @@ -18,7 +18,7 @@ - block: - name: Include "{{ansible_os_family}}" tasks - include: "{{ansible_os_family}}.yml" + include_tasks: "{{ansible_os_family}}.yml" - name: Assure that /etc/default/docker exists copy: From 52f36c265540ec453fa8faf03142688aa7a8fc80 Mon Sep 17 00:00:00 2001 From: micafer Date: Thu, 11 Jan 2024 11:18:23 +0100 Subject: [PATCH 3/5] Decrease docker compose version --- defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 0ec56b1..069c5da 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -9,7 +9,7 @@ docker_version: "latest" docker_compatible_versions: [] docker_install_criu: true docker_install_pip: true -docker_compose_version: "2.23.3" +docker_compose_version: "2.23.2" docker_config_values: {} # Nvidia docker options to add in the docker.json file docker_nvidia_support: false From 06e20a7a7340c44dfe8a76d3b0cc77c62e44ff47 Mon Sep 17 00:00:00 2001 From: micafer Date: Thu, 11 Jan 2024 11:23:45 +0100 Subject: [PATCH 4/5] Fix docker compose download --- tasks/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/docker.yml b/tasks/docker.yml index c7b9d9b..4e69774 100644 --- a/tasks/docker.yml +++ b/tasks/docker.yml @@ -165,7 +165,7 @@ - name: Install docker compose get_url: - url: "https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64" + url: "https://github.com/docker/compose/releases/download/v{{ docker_compose_version }}/docker-compose-Linux-x86_64" dest: /usr/local/bin/docker-compose mode: '0755' when: docker_compose_version != "" From 1b0051dd4958205d3d1195555ac3ebcb57f0b352 Mon Sep 17 00:00:00 2001 From: micafer Date: Thu, 11 Jan 2024 11:25:16 +0100 Subject: [PATCH 5/5] Fix docker compose download --- defaults/main.yml | 2 +- tasks/docker.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 069c5da..f38f185 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -9,7 +9,7 @@ docker_version: "latest" docker_compatible_versions: [] docker_install_criu: true docker_install_pip: true -docker_compose_version: "2.23.2" +docker_compose_version: "v2.23.2" docker_config_values: {} # Nvidia docker options to add in the docker.json file docker_nvidia_support: false diff --git a/tasks/docker.yml b/tasks/docker.yml index 4e69774..c7b9d9b 100644 --- a/tasks/docker.yml +++ b/tasks/docker.yml @@ -165,7 +165,7 @@ - name: Install docker compose get_url: - url: "https://github.com/docker/compose/releases/download/v{{ docker_compose_version }}/docker-compose-Linux-x86_64" + url: "https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64" dest: /usr/local/bin/docker-compose mode: '0755' when: docker_compose_version != ""