From 40d6f5744fdc263d1c3fac77526b56f298ee0bff Mon Sep 17 00:00:00 2001 From: Suraj Deshmukh Date: Thu, 9 May 2024 18:30:07 +0000 Subject: [PATCH] tools-image: Fix the azure ansible collection installation The upstream has moved the ansible collections `requirements-azure.txt` to `requirements.txt` file in the PR: https://github.com/ansible-collections/azure/pull/1552. So we need to update the `requirements-azure.txt` to `requirements.txt` in the `tools.Dockerfile` to fix the installation of the azure ansible collection. Signed-off-by: Suraj Deshmukh --- linux/tools.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/tools.Dockerfile b/linux/tools.Dockerfile index 6c62cfcd..177c9ece 100644 --- a/linux/tools.Dockerfile +++ b/linux/tools.Dockerfile @@ -55,8 +55,8 @@ RUN curl -Lo bicep https://github.com/Azure/bicep/releases/latest/download/bicep # Temp: fix ansible modules. Proper fix is to update base layer to use regular python for Ansible. RUN mkdir -p /usr/share/ansible/collections/ansible_collections/azure/azcollection/ \ - && wget -nv -q -O /usr/share/ansible/collections/ansible_collections/azure/azcollection/requirements-azure.txt https://raw.githubusercontent.com/ansible-collections/azure/dev/requirements-azure.txt \ - && /opt/ansible/bin/python -m pip install -r /usr/share/ansible/collections/ansible_collections/azure/azcollection/requirements-azure.txt + && wget -nv -q -O /usr/share/ansible/collections/ansible_collections/azure/azcollection/requirements.txt https://raw.githubusercontent.com/ansible-collections/azure/dev/requirements.txt \ + && /opt/ansible/bin/python -m pip install -r /usr/share/ansible/collections/ansible_collections/azure/azcollection/requirements.txt # Copy and run script to Install powershell modules and setup Powershell machine profile COPY ./linux/powershell/PSCloudShellUtility/ /usr/local/share/powershell/Modules/PSCloudShellUtility/