Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ WORKDIR /home/non-root-user
RUN <<-EOT
set -eux
sudo apt-get update
sudo apt-get install -y curl tar apt-transport-https ca-certificates gnupg socat less debian-goodies autossh ca-certificates-java python3-pip locales jq git gh yq lsb-release lsof
sudo apt-get install -y curl tar apt-transport-https ca-certificates gnupg socat less debian-goodies autossh ca-certificates-java python3-pip locales jq git gh yq lsb-release lsof unzip
sudo locale-gen en_US.UTF-8
sudo git config --system --add safe.directory "*"

Expand All @@ -149,13 +149,25 @@ COPY --from=default-jdk /usr/lib/jvm /usr/lib/jvm
# Install the following tools
# - awscli: AWS CLI
# - datadog-ci: Datadog CI tool
# - vault: tool for managing secrets: https://datadoghq.atlassian.net/wiki/spaces/RUNTIME/pages/2701559033/Vault
RUN <<-EOT
set -eux
sudo apt-get update
sudo pip3 install --break-system-packages awscli
sudo pip3 cache purge

# datadog-ci
sudo curl -L --fail "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-x64" --output "/usr/local/bin/datadog-ci"
sudo chmod +x /usr/local/bin/datadog-ci

# vault installation inspired by https://github.com/DataDog/datadog-agent-buildimages/blob/main/agent-deploy/Dockerfile
VAULT_VERSION=1.20.4
curl -fsSL "https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_linux_amd64.zip" -o vault.zip
unzip vault.zip
sudo mv vault /usr/local/bin/vault
chmod +x /usr/local/bin/vault
rm vault.zip

sudo apt-get clean
sudo rm -rf /var/lib/apt/lists/*
EOT
Expand Down
1 change: 1 addition & 0 deletions build
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ function do_inner_describe() {
echo "* $(docker --version)"
echo "* $(docker compose version)"
echo "* datadog-ci $(datadog-ci version)"
echo "* vault $(vault --version)"
echo
echo "## JDKs"
echo
Expand Down