Skip to content

Commit

Permalink
Ensure docker==6.1.3 and requests==2.28.1 to support docker-compose v1 (
Browse files Browse the repository at this point in the history
#490)

Signed-off-by: Peter Zhu <[email protected]>
  • Loading branch information
peterzhuamazon authored Aug 13, 2024
1 parent 9623abc commit fffd8c4
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
8 changes: 7 additions & 1 deletion packer/scripts/al2/al2-agent-setups.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions packer/scripts/al2023/al2023-agent-setups.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fffd8c4

Please sign in to comment.