From fe431c34ef71fef4678f0930fa9fc22388119d83 Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Tue, 29 Aug 2023 08:08:28 -0700 Subject: [PATCH] chore(ci): Re-add docker-compose installation (#18415) * chore(ci): Re-add docker-compose installation So that the bootstrap script installs docker-compose when used by scripts/environment/Dockerfile (but not in CI which already has it). Signed-off-by: Jesse Szwedko * Fix capitalization Signed-off-by: Jesse Szwedko --------- Signed-off-by: Jesse Szwedko --- scripts/environment/bootstrap-ubuntu-20.04.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/environment/bootstrap-ubuntu-20.04.sh b/scripts/environment/bootstrap-ubuntu-20.04.sh index c88a33d5e1fc32..4536ae94e16988 100755 --- a/scripts/environment/bootstrap-ubuntu-20.04.sh +++ b/scripts/environment/bootstrap-ubuntu-20.04.sh @@ -109,6 +109,12 @@ if ! [ -x "$(command -v docker)" ]; then usermod --append --groups docker ubuntu || true fi +# docker-compose +if ! [ -x "$(command -v docker-compose)" ]; then + curl -fsSL "https://github.com/docker/compose/releases/download/2.20.3/docker-compose-linux-$(dpkg --print-architecture)" -o /usr/local/bin/docker-compose + chmod +x /usr/local/bin/docker-compose +fi + bash scripts/environment/install-protoc.sh # Apt cleanup