From fffd8c42c7cf62c74ffe6eda5f5d492701229e09 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 13 Aug 2024 16:57:38 -0400 Subject: [PATCH] Ensure docker==6.1.3 and requests==2.28.1 to support docker-compose v1 (#490) Signed-off-by: Peter Zhu --- packer/scripts/al2/al2-agent-setups.sh | 8 +++++++- packer/scripts/al2023/al2023-agent-setups.sh | 8 ++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/packer/scripts/al2/al2-agent-setups.sh b/packer/scripts/al2/al2-agent-setups.sh index 12908f1f..68699e29 100755 --- a/packer/scripts/al2/al2-agent-setups.sh +++ b/packer/scripts/al2/al2-agent-setups.sh @@ -40,7 +40,13 @@ sudo yum groupinstall -y "Development Tools" curl -o- https://bootstrap.pypa.io/get-pip.py | python3 echo "export PATH=$PATH:$HOME/.local/bin" >> $HOME/.bashrc export PATH=$PATH:$HOME/.local/bin -pip install pipenv awscli docker-compose +# https://github.com/opensearch-project/opensearch-build/issues/4946 +pip install requests==2.28.1 +pip install docker==6.1.3 +pip install docker-compose==1.29.2 +# Temp Solution: https://github.com/opensearch-project/opensearch-build/issues/4929 +pip install --force-reinstall packaging==24.1 +pip install pipenv awscli pipenv --version && aws --version && docker-compose --version sudo sed -i 's/OPTIONS/# OPTIONS/g' /etc/sysconfig/docker diff --git a/packer/scripts/al2023/al2023-agent-setups.sh b/packer/scripts/al2023/al2023-agent-setups.sh index bdfdfd10..0aa3aef4 100755 --- a/packer/scripts/al2023/al2023-agent-setups.sh +++ b/packer/scripts/al2023/al2023-agent-setups.sh @@ -32,9 +32,13 @@ fi curl -o- https://bootstrap.pypa.io/get-pip.py | python3 echo "export PATH=$PATH:$HOME/.local/bin" >> $HOME/.bashrc export PATH=$PATH:$HOME/.local/bin -pip install pipenv awscli docker-compose +# https://github.com/opensearch-project/opensearch-build/issues/4946 +pip install requests==2.28.1 +pip install docker==6.1.3 +pip install docker-compose==1.29.2 # Temp Solution: https://github.com/opensearch-project/opensearch-build/issues/4929 -pip install --upgrade packaging +pip install --force-reinstall packaging==24.1 +pip install pipenv awscli pipenv --version && aws --version && docker-compose --version sudo sed -i 's/OPTIONS/# OPTIONS/g' /etc/sysconfig/docker