Skip to content

Commit

Permalink
chore(ci): Re-add docker-compose installation (#18415)
Browse files Browse the repository at this point in the history
* 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 <jesse.szwedko@datadoghq.com>

* Fix capitalization

Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>

* Correct architecture name

Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>

* Fix url

---------

Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>
  • Loading branch information
jszwedko authored Sep 1, 2023
1 parent 9f95026 commit c1ed017
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions scripts/environment/bootstrap-ubuntu-20.04.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/v2.20.3/docker-compose-linux-$(uname -m)" -o /usr/local/bin/docker-compose
chmod +x /usr/local/bin/docker-compose
fi

bash scripts/environment/install-protoc.sh

# Apt cleanup
Expand Down

0 comments on commit c1ed017

Please sign in to comment.