From 62886006beb4dc75db06dedf76bc3105eb2901b5 Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Mon, 28 Aug 2023 15:13:17 -0700 Subject: [PATCH 1/4] 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 --- 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 c88a33d5e1fc3..0dd7bf5a862d1 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 From 4f5a7aad6c5691dbd929a6482030d8470a8eaf02 Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Tue, 29 Aug 2023 07:29:25 -0700 Subject: [PATCH 2/4] Fix capitalization Signed-off-by: Jesse Szwedko --- scripts/environment/bootstrap-ubuntu-20.04.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/environment/bootstrap-ubuntu-20.04.sh b/scripts/environment/bootstrap-ubuntu-20.04.sh index 0dd7bf5a862d1..4536ae94e1698 100755 --- a/scripts/environment/bootstrap-ubuntu-20.04.sh +++ b/scripts/environment/bootstrap-ubuntu-20.04.sh @@ -111,7 +111,7 @@ 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 + 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 From b7eccb9b555a28f32790c4b917c0fac26285fd69 Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Fri, 1 Sep 2023 12:54:03 -0400 Subject: [PATCH 3/4] Correct architecture name Signed-off-by: Jesse Szwedko --- scripts/environment/bootstrap-ubuntu-20.04.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/environment/bootstrap-ubuntu-20.04.sh b/scripts/environment/bootstrap-ubuntu-20.04.sh index 4536ae94e1698..80357cbdb88fb 100755 --- a/scripts/environment/bootstrap-ubuntu-20.04.sh +++ b/scripts/environment/bootstrap-ubuntu-20.04.sh @@ -111,7 +111,7 @@ 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 + curl -fsSL "https://github.com/docker/compose/releases/download/2.20.3/docker-compose-linux-$(uname -m)" -o /usr/local/bin/docker-compose chmod +x /usr/local/bin/docker-compose fi From c539d6feea4110a660df8c118eb1ac4fd6591f9c Mon Sep 17 00:00:00 2001 From: Jesse Date: Fri, 1 Sep 2023 20:11:37 +0000 Subject: [PATCH 4/4] Fix url --- scripts/environment/bootstrap-ubuntu-20.04.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/environment/bootstrap-ubuntu-20.04.sh b/scripts/environment/bootstrap-ubuntu-20.04.sh index 80357cbdb88fb..b5eedad16afca 100755 --- a/scripts/environment/bootstrap-ubuntu-20.04.sh +++ b/scripts/environment/bootstrap-ubuntu-20.04.sh @@ -111,7 +111,7 @@ 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-$(uname -m)" -o /usr/local/bin/docker-compose + curl -fsSL "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-$(uname -m)" -o /usr/local/bin/docker-compose chmod +x /usr/local/bin/docker-compose fi