From d8685f5ac7a225b55a074de6c4a54abf3e9042e3 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 27 Jun 2024 05:43:54 -0700 Subject: [PATCH] Remove all `@sha256:...` pins in Dockerfiles These builds will all be broken with the Clang update anyway so go ahead and remove the pins to keep everything on the latest. --- projects/ampproject/Dockerfile | 4 ++-- projects/bignum-fuzzer/Dockerfile | 4 ++-- projects/boost-json/Dockerfile | 4 ++-- projects/boost/Dockerfile | 1 + projects/cryptofuzz/Dockerfile | 3 +-- projects/immer/Dockerfile | 4 ++-- projects/libecc/Dockerfile | 4 ++-- projects/libressl/Dockerfile | 3 +-- projects/nettle/Dockerfile | 4 ++-- projects/opencv/Dockerfile | 4 ++-- projects/orbit/Dockerfile | 4 ++-- projects/pcl/Dockerfile | 8 ++++---- projects/quiche/Dockerfile | 3 +-- projects/rustcrypto/Dockerfile | 6 ++---- projects/solidity/Dockerfile | 4 ++-- projects/tensorflow-serving/Dockerfile | 6 +++--- projects/tensorflow/Dockerfile | 3 +-- projects/xnu/Dockerfile | 3 +-- projects/zeek/Dockerfile | 3 +-- 19 files changed, 34 insertions(+), 41 deletions(-) diff --git a/projects/ampproject/Dockerfile b/projects/ampproject/Dockerfile index 86e67e38b53f..a6b43d46226a 100644 --- a/projects/ampproject/Dockerfile +++ b/projects/ampproject/Dockerfile @@ -14,8 +14,8 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e -# ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors +FROM gcr.io/oss-fuzz-base/base-builder + RUN apt-get update && apt-get install -y make autoconf automake libtool libomp-dev libgomp1 nodejs COPY build.sh *.diff $SRC/ diff --git a/projects/bignum-fuzzer/Dockerfile b/projects/bignum-fuzzer/Dockerfile index 701b3dd89a20..e795fd7fe3d6 100644 --- a/projects/bignum-fuzzer/Dockerfile +++ b/projects/bignum-fuzzer/Dockerfile @@ -14,8 +14,8 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e -# ! Project pinned after a clang update and an afl link error. Log: https://oss-fuzz-gcb-logs.storage.googleapis.com/log-6083635a-3f72-444d-80ef-3a0a26670cf7.txt +FROM gcr.io/oss-fuzz-base/base-builder + RUN apt-get update && apt-get install -y software-properties-common curl sudo mercurial autoconf bison texinfo libboost-all-dev cmake wget lzip RUN wget https://go.dev/dl/go1.17.5.linux-amd64.tar.gz && rm -rf /usr/local/go && tar -C /usr/local -xzf go1.17.5.linux-amd64.tar.gz && ldconfig ENV PATH=$PATH:/usr/local/go/bin diff --git a/projects/boost-json/Dockerfile b/projects/boost-json/Dockerfile index c6f4dd83eaa5..50a586cd4ea5 100644 --- a/projects/boost-json/Dockerfile +++ b/projects/boost-json/Dockerfile @@ -14,8 +14,8 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e -# ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors +FROM gcr.io/oss-fuzz-base/base-builder + #RUN apt-get update && apt-get install -y g++ RUN git clone --depth 1 --single-branch --branch master https://github.com/boostorg/boost.git diff --git a/projects/boost/Dockerfile b/projects/boost/Dockerfile index b7ecc0275690..2aded7e85d24 100644 --- a/projects/boost/Dockerfile +++ b/projects/boost/Dockerfile @@ -15,6 +15,7 @@ ################################################################################ FROM gcr.io/oss-fuzz-base/base-builder + RUN apt-get update && apt-get install -y g++ python RUN git clone --recursive https://github.com/boostorg/boost.git diff --git a/projects/cryptofuzz/Dockerfile b/projects/cryptofuzz/Dockerfile index d6cf1f4605a4..1957777e643d 100644 --- a/projects/cryptofuzz/Dockerfile +++ b/projects/cryptofuzz/Dockerfile @@ -14,8 +14,7 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder-rust@sha256:c5216a9896a598dced7ce6708bb3226e443473f567045b4f282595776cc641f1 -# ! Project pinned after a clang update and an afl link error. Log: https://oss-fuzz-gcb-logs.storage.googleapis.com/log-8bc8a5ea-9bfb-421d-bfe9-911828e88741.txt +FROM gcr.io/oss-fuzz-base/base-builder-rust RUN apt-get update && \ apt-get install -y software-properties-common wget make autoconf automake libtool build-essential cmake mercurial gyp ninja-build zlib1g-dev libsqlite3-dev bison flex texinfo lzip bsdmainutils diff --git a/projects/immer/Dockerfile b/projects/immer/Dockerfile index 43ca22b368a6..fb636a3aca99 100644 --- a/projects/immer/Dockerfile +++ b/projects/immer/Dockerfile @@ -14,8 +14,8 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e -# ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors +FROM gcr.io/oss-fuzz-base/base-builder + RUN apt-get update && apt-get install -y cmake libgc-dev pkg-config RUN git clone --depth 1 https://github.com/arximboldi/immer.git immer WORKDIR immer diff --git a/projects/libecc/Dockerfile b/projects/libecc/Dockerfile index 90b7e0999c77..5d3e59205886 100644 --- a/projects/libecc/Dockerfile +++ b/projects/libecc/Dockerfile @@ -14,8 +14,8 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e -# ! Project pinned after a clang update and an afl link error. Log: https://oss-fuzz-gcb-logs.storage.googleapis.com/log-bca72181-cfb2-4b2f-98f1-c2addee0aa4b.txt +FROM gcr.io/oss-fuzz-base/base-builder + RUN apt-get update && apt-get install -y make autoconf automake libtool wget python bison flex texinfo lzip bsdmainutils RUN git clone --depth 1 --branch cryptofuzz https://github.com/libecc/libecc.git RUN git clone --depth 1 https://github.com/randombit/botan.git diff --git a/projects/libressl/Dockerfile b/projects/libressl/Dockerfile index a130572c08b9..2070c68998c3 100644 --- a/projects/libressl/Dockerfile +++ b/projects/libressl/Dockerfile @@ -14,8 +14,7 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e -# ! Project pinned after a clang update and an afl link error. Log: https://oss-fuzz-gcb-logs.storage.googleapis.com/log-db180642-1ff0-4223-91e6-3bf060adb174.txt +FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y make cmake wget autoconf automake libtool bison flex texinfo lzip RUN git clone --depth 1 https://github.com/libressl/portable.git libressl diff --git a/projects/nettle/Dockerfile b/projects/nettle/Dockerfile index f667134aa904..3932583e5fb3 100644 --- a/projects/nettle/Dockerfile +++ b/projects/nettle/Dockerfile @@ -14,8 +14,8 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e -# ! Project pinned after a clang update and an afl link error. Log: https://oss-fuzz-gcb-logs.storage.googleapis.com/log-e701b6fa-f3a0-414e-ad6e-0223e6d42ebd.txt +FROM gcr.io/oss-fuzz-base/base-builder + RUN apt-get update && apt-get install -y software-properties-common make autoconf build-essential wget lzip libtool python RUN git clone --depth 1 https://git.lysator.liu.se/nettle/nettle RUN git clone --depth 1 https://github.com/randombit/botan.git diff --git a/projects/opencv/Dockerfile b/projects/opencv/Dockerfile index 1c58a02cb988..a23691ba9397 100644 --- a/projects/opencv/Dockerfile +++ b/projects/opencv/Dockerfile @@ -14,8 +14,8 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e -# ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors. A compiler bug is the suspected cause, and it may be fixed on the next oss-fuzz clang roll +FROM gcr.io/oss-fuzz-base/base-builder + RUN apt-get update && apt-get install -y build-essential cmake pkg-config RUN git clone --depth 1 https://github.com/opencv/opencv.git opencv WORKDIR opencv/ diff --git a/projects/orbit/Dockerfile b/projects/orbit/Dockerfile index a9136e03d04e..85048d93f3a1 100644 --- a/projects/orbit/Dockerfile +++ b/projects/orbit/Dockerfile @@ -14,8 +14,8 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e -# ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors +FROM gcr.io/oss-fuzz-base/base-builder + RUN apt-get update && apt-get install -y m4 libglu1-mesa-dev mesa-common-dev \ libxmu-dev libxi-dev pkg-config libxxf86vm-dev patchelf diff --git a/projects/pcl/Dockerfile b/projects/pcl/Dockerfile index a23010900bc2..d584ca9cf39c 100644 --- a/projects/pcl/Dockerfile +++ b/projects/pcl/Dockerfile @@ -14,12 +14,12 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e -# ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors +FROM gcr.io/oss-fuzz-base/base-builder + RUN apt-get update && apt-get install -y make cmake autoconf \ automake libtool gettext pkg-config build-essential \ - mercurial wget libeigen3-dev libflann-dev python python-dev - + mercurial wget libeigen3-dev libflann-dev python python-dev + # VTK deps RUN apt-get update && apt-get install -y \ libavcodec-dev libavformat-dev libavutil-dev libboost-dev \ diff --git a/projects/quiche/Dockerfile b/projects/quiche/Dockerfile index b983ae41fb8e..a4e2f474b719 100644 --- a/projects/quiche/Dockerfile +++ b/projects/quiche/Dockerfile @@ -14,8 +14,7 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e -# ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors +FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y zlib1g-dev libicu-dev RUN git clone --depth 1 https://github.com/google/quiche diff --git a/projects/rustcrypto/Dockerfile b/projects/rustcrypto/Dockerfile index 21ae73d8c1d3..eef4f14c70c9 100644 --- a/projects/rustcrypto/Dockerfile +++ b/projects/rustcrypto/Dockerfile @@ -14,10 +14,8 @@ # ################################################################################ -# Held back because of github.com/google/oss-fuzz/pull/8313 -# Please fix failure and upgrade. -FROM gcr.io/oss-fuzz-base/base-builder@sha256:111d6b9d3a52bd3392602c71dc8936c628607a7a9bc86d381db7586f9b1e840f -# ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors +FROM gcr.io/oss-fuzz-base/base-builder + RUN apt-get update && apt-get install -y make autoconf automake libtool wget python RUN git clone --depth 1 https://github.com/guidovranken/cryptofuzz RUN git clone --depth 1 https://github.com/randombit/botan.git diff --git a/projects/solidity/Dockerfile b/projects/solidity/Dockerfile index 935ef72dfec3..e4ef3ce8b06a 100644 --- a/projects/solidity/Dockerfile +++ b/projects/solidity/Dockerfile @@ -14,8 +14,8 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e -# ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors +FROM gcr.io/oss-fuzz-base/base-builder + RUN apt-get update && apt-get install -y make autoconf automake libtool \ build-essential libbz2-dev ninja-build zlib1g-dev wget python python-dev \ liblzma-dev uuid-dev pkg-config openjdk-8-jdk unzip mlton bison texinfo diff --git a/projects/tensorflow-serving/Dockerfile b/projects/tensorflow-serving/Dockerfile index 724a242aa781..e9a3e7858d1b 100644 --- a/projects/tensorflow-serving/Dockerfile +++ b/projects/tensorflow-serving/Dockerfile @@ -14,8 +14,8 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e -# ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors +FROM gcr.io/oss-fuzz-base/base-builder + RUN apt-get update && apt-get install -y make autoconf automake libtool default-jdk bison m4 \ build-essential\ curl \ @@ -28,7 +28,7 @@ RUN apt-get update && apt-get install -y make autoconf automake libtool default- mcpp \ sqlite \ uuid-runtime \ - zlib1g-dev + zlib1g-dev RUN python3 -m pip install numpy RUN wget https://github.com/bazelbuild/buildtools/releases/download/4.2.5/buildifier-linux-amd64 \ -O /usr/local/bin/buildifier && chmod a+x /usr/local/bin/buildifier diff --git a/projects/tensorflow/Dockerfile b/projects/tensorflow/Dockerfile index d42f8126f808..648496dcc8d2 100644 --- a/projects/tensorflow/Dockerfile +++ b/projects/tensorflow/Dockerfile @@ -14,8 +14,7 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e -# ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors +FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y --no-install-recommends \ curl \ diff --git a/projects/xnu/Dockerfile b/projects/xnu/Dockerfile index e9497e0b015e..ab69648a64fc 100644 --- a/projects/xnu/Dockerfile +++ b/projects/xnu/Dockerfile @@ -14,8 +14,7 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e -# ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors +FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y \ autoconf \ diff --git a/projects/zeek/Dockerfile b/projects/zeek/Dockerfile index cf8088279c2b..a009f965746c 100644 --- a/projects/zeek/Dockerfile +++ b/projects/zeek/Dockerfile @@ -14,8 +14,7 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e -# ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors +FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y --no-install-recommends \ patchelf \