From 5944efdc95b888160577be3b3b6882740440a0ba Mon Sep 17 00:00:00 2001 From: Ali Mehraji Date: Wed, 8 Jan 2025 16:33:44 +0330 Subject: [PATCH 1/3] Add: requirements.txt, update docker compose version to 2.32.1 --- .github/workflows/ci.yml | 2 +- README.md | 2 +- defaults/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf25c4e..3090501 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,7 @@ jobs: python-version: '3.x' - name: Install test dependencies. - run: pip3 install ansible molecule molecule-plugins[docker] docker + run: pip3 install -r requirements.txt - name: Run Molecule tests. run: molecule test diff --git a/README.md b/README.md index 479ae62..2460145 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Docker Compose Plugin installation options. These differ from the below in that ```yaml docker_install_compose: false -docker_compose_version: "2.29.2" +docker_compose_version: "v2.32.1" docker_compose_arch: "{{ ansible_architecture }}" docker_compose_url: "https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-linux-{{ docker_compose_arch }}" docker_compose_path: /usr/local/bin/docker-compose diff --git a/defaults/main.yml b/defaults/main.yml index 4126d86..fa13b89 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -30,7 +30,7 @@ docker_compose_package_state: present # Docker Compose options. docker_install_compose: false -docker_compose_version: "v2.29.2" +docker_compose_version: "v2.32.1" docker_compose_arch: "{{ ansible_architecture }}" docker_compose_url: "https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-linux-{{ docker_compose_arch }}" docker_compose_path: /usr/local/bin/docker-compose From 3f66f26c2427c8300d44cbde0e98f1450d980cc0 Mon Sep 17 00:00:00 2001 From: Ali Mehraji Date: Wed, 8 Jan 2025 16:33:56 +0330 Subject: [PATCH 2/3] Add: requirements.txt, update docker compose version to 2.32.1 --- requirements.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..9a3152e --- /dev/null +++ b/requirements.txt @@ -0,0 +1,4 @@ +yamllint +ansible +molecule +molecule-plugins[docker] \ No newline at end of file From 0e347d18ff0be19284a0abe577b497aab31ac313 Mon Sep 17 00:00:00 2001 From: Ali Mehraji Date: Wed, 8 Jan 2025 20:44:42 +0330 Subject: [PATCH 3/3] revert: .github/workflows/ci.yml and remove the requirements.txt --- .github/workflows/ci.yml | 2 +- requirements.txt | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 requirements.txt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3090501..bf25c4e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,7 @@ jobs: python-version: '3.x' - name: Install test dependencies. - run: pip3 install -r requirements.txt + run: pip3 install ansible molecule molecule-plugins[docker] docker - name: Run Molecule tests. run: molecule test diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 9a3152e..0000000 --- a/requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -yamllint -ansible -molecule -molecule-plugins[docker] \ No newline at end of file