diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index bd564d971b..87d6aa9d80 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -87,14 +87,16 @@ RUN curl -sS https://releases.nixos.org/patchelf/patchelf-0.9/patchelf-0.9.tar.b rm -rf /tmp/patchelf-* # Install Ruby, for Ruby fuzzing. -RUN apt-get install -y binutils xz-utils libyaml-dev libffi-dev zlib1g-dev && \ +RUN apt-get update && apt-get install -y binutils xz-utils libyaml-dev libffi-dev zlib1g-dev && \ RUBY_VERSION=3.3.1 && \ curl -O https://cache.ruby-lang.org/pub/ruby/3.3/ruby-$RUBY_VERSION.tar.gz && \ tar -xvf ruby-$RUBY_VERSION.tar.gz && \ cd ruby-$RUBY_VERSION && \ ./configure && \ make -j$(nproc) && \ - make install + make install && \ + cd - && \ + rm -rf ruby-$RUBY_VERSION ruby-$RUBY_VERSION.tar.gz # Install OpenJDK 17 for Jazzer (Java fuzzer). # Copied from gcr.io/oss-fuzz-base/base-runner. diff --git a/docker/base/ubuntu-20-04.Dockerfile b/docker/base/ubuntu-20-04.Dockerfile index f44b239108..51e625a97a 100644 --- a/docker/base/ubuntu-20-04.Dockerfile +++ b/docker/base/ubuntu-20-04.Dockerfile @@ -87,14 +87,16 @@ RUN curl -sS https://releases.nixos.org/patchelf/patchelf-0.9/patchelf-0.9.tar.b rm -rf /tmp/patchelf-* # Install Ruby, for Ruby fuzzing. -RUN apt-get install -y binutils xz-utils libyaml-dev libffi-dev zlib1g-dev && \ +RUN apt-get update && apt-get install -y binutils xz-utils libyaml-dev libffi-dev zlib1g-dev && \ RUBY_VERSION=3.3.1 && \ curl -O https://cache.ruby-lang.org/pub/ruby/3.3/ruby-$RUBY_VERSION.tar.gz && \ tar -xvf ruby-$RUBY_VERSION.tar.gz && \ cd ruby-$RUBY_VERSION && \ ./configure && \ make -j$(nproc) && \ - make install + make install && \ + cd - && \ + rm -rf ruby-$RUBY_VERSION ruby-$RUBY_VERSION.tar.gz # Install OpenJDK 17 for Jazzer (Java fuzzer). # Copied from gcr.io/oss-fuzz-base/base-runner. diff --git a/docker/base/ubuntu-24-04.Dockerfile b/docker/base/ubuntu-24-04.Dockerfile index 7a63f5648e..f3487373bd 100644 --- a/docker/base/ubuntu-24-04.Dockerfile +++ b/docker/base/ubuntu-24-04.Dockerfile @@ -64,14 +64,16 @@ RUN curl -sS https://releases.nixos.org/patchelf/patchelf-0.9/patchelf-0.9.tar.b rm -rf /tmp/patchelf-* # Install Ruby, for Ruby fuzzing. -RUN apt-get install -y binutils xz-utils libyaml-dev libffi-dev zlib1g-dev && \ +RUN apt-get update && apt-get install -y binutils xz-utils libyaml-dev libffi-dev zlib1g-dev && \ RUBY_VERSION=3.3.1 && \ curl -O https://cache.ruby-lang.org/pub/ruby/3.3/ruby-$RUBY_VERSION.tar.gz && \ tar -xvf ruby-$RUBY_VERSION.tar.gz && \ cd ruby-$RUBY_VERSION && \ ./configure && \ make -j$(nproc) && \ - make install + make install && \ + cd - && \ + rm -rf ruby-$RUBY_VERSION ruby-$RUBY_VERSION.tar.gz # Install OpenJDK 17 for Jazzer (Java fuzzer). # Copied from gcr.io/oss-fuzz-base/base-runner. diff --git a/docker/chromium/base/ubuntu-24-04.Dockerfile b/docker/chromium/base/ubuntu-24-04.Dockerfile index 9175f27410..a19ccff5f2 100644 --- a/docker/chromium/base/ubuntu-24-04.Dockerfile +++ b/docker/chromium/base/ubuntu-24-04.Dockerfile @@ -12,7 +12,7 @@ ENV UPDATE_WEB_TESTS True # Note: snapcraft installation seems to always fail. RUN ln -s /usr/local/bin/python3.11 /usr/local/bin/python3 -RUN echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && curl 'https://chromium.googlesource.com/chromium/src/+/main/build/install-build-deps.py?format=TEXT' | base64 -d > /tmp/install-build-deps.py && sed -i s/snapcraft/doesnotexist/ /tmp/install-build-deps.py && sed -i "s/if requires_pinned_linux_libc():/if False:/" /tmp/install-build-deps.py && chmod u+x /tmp/install-build-deps.py && /tmp/install-build-deps.py --backwards-compatible --no-prompt --no-chromeos-fonts --syms --lib32 +RUN apt-get update && echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && curl 'https://chromium.googlesource.com/chromium/src/+/main/build/install-build-deps.py?format=TEXT' | base64 -d > /tmp/install-build-deps.py && sed -i s/snapcraft/doesnotexist/ /tmp/install-build-deps.py && sed -i "s/if requires_pinned_linux_libc():/if False:/" /tmp/install-build-deps.py && chmod u+x /tmp/install-build-deps.py && /tmp/install-build-deps.py --backwards-compatible --no-prompt --no-chromeos-fonts --syms --lib32 RUN dpkg --add-architecture i386 && \