diff --git a/infra/cifuzz/cifuzz-base/Dockerfile b/infra/cifuzz/cifuzz-base/Dockerfile index 5884922b158f..3b0f0b3a99da 100644 --- a/infra/cifuzz/cifuzz-base/Dockerfile +++ b/infra/cifuzz/cifuzz-base/Dockerfile @@ -16,14 +16,23 @@ FROM gcr.io/oss-fuzz-base/base-runner +# Install system dependencies, Docker CLI, and Google Cloud SDK (excluding gsutil and bq) 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 & Repo 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 focal stable" > /etc/apt/sources.list.d/docker.list && \ + # Google Cloud SDK GPG Key & Repo + 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 CLI without unwanted extras apt-get update && \ - apt-get install -y docker-ce-cli + apt-get install -y docker-ce-cli google-cloud-cli && \ + 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 @@ -38,7 +47,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.