Skip to content
Closed
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
15 changes: 12 additions & 3 deletions infra/cifuzz/cifuzz-base/ubuntu-24-04.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,23 @@
FROM gcr.io/oss-fuzz-base/base-runner:ubuntu-24-04

RUN apt-get update && \
apt-get install -y systemd wget gnupg && \
apt-get install -y systemd wget gnupg apt-transport-https ca-certificates curl && \
install -m 0755 -d /etc/apt/keyrings && \
# Docker GPG Key & Repository setup
wget -qO- https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg && \
chmod a+r /etc/apt/keyrings/docker.gpg && \
echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu noble stable" > /etc/apt/sources.list.d/docker.list && \
# Google Cloud SDK GPG Key & Repository setup
curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor -o /etc/apt/keyrings/cloud.google.gpg && \
chmod a+r /etc/apt/keyrings/cloud.google.gpg && \
echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" > /etc/apt/sources.list.d/google-cloud-sdk.list && \
# Install Docker CLI and Google Cloud SDK
apt-get update && \
apt-get install -y docker-ce-cli
apt-get install -y docker-ce-cli google-cloud-cli && \
# Explicitly remove legacy gsutil and bq CLI binaries
rm -f /usr/bin/gsutil /usr/bin/bq /opt/gcloud/google-cloud-sdk/bin/gsutil /opt/gcloud/google-cloud-sdk/bin/bq && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

ENV PATH=/opt/gcloud/google-cloud-sdk/bin/:$PATH
ENV OSS_FUZZ_ROOT=/opt/oss-fuzz
Expand All @@ -38,7 +48,6 @@ ADD . ${OSS_FUZZ_ROOT}
# OSS_FUZZ_ROOT.
RUN cd ${OSS_FUZZ_ROOT} && npm install ${OSS_FUZZ_ROOT}/infra/cifuzz


ENV PYTHONUNBUFFERED=1

# Python file to execute when the docker container starts up.
Expand Down
Loading