Skip to content

Update buildpacks to include jq. #12726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 2, 2022
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
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# (c) 2016-2021 solidity contributors.
#------------------------------------------------------------------------------
FROM gcr.io/oss-fuzz-base/base-clang:latest as base
LABEL version="15"
LABEL version="16"

ARG DEBIAN_FRONTEND=noninteractive

Expand All @@ -32,7 +32,7 @@ RUN apt-get update; \
software-properties-common \
ninja-build git wget \
libbz2-dev zlib1g-dev git curl uuid-dev \
pkg-config openjdk-8-jdk liblzma-dev unzip mlton m4; \
pkg-config openjdk-8-jdk liblzma-dev unzip mlton m4 jq; \
apt-get install -qy python3-pip;

# Install cmake 3.21.2 (minimum requirement is cmake 3.10)
Expand Down
4 changes: 2 additions & 2 deletions scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# (c) 2016-2019 solidity contributors.
#------------------------------------------------------------------------------
FROM buildpack-deps:focal AS base
LABEL version="10"
LABEL version="11"

ARG DEBIAN_FRONTEND=noninteractive

Expand All @@ -37,7 +37,7 @@ RUN set -ex; \
cmake ninja-build \
libboost-filesystem-dev libboost-test-dev libboost-system-dev \
libboost-program-options-dev \
libcvc4-dev libz3-static-dev z3-static \
libcvc4-dev libz3-static-dev z3-static jq \
; \
apt-get install -qy python3-pip python3-sphinx; \
pip3 install codecov; \
Expand Down
4 changes: 2 additions & 2 deletions scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# (c) 2016-2019 solidity contributors.
#------------------------------------------------------------------------------
FROM buildpack-deps:focal AS base
LABEL version="10"
LABEL version="11"

ARG DEBIAN_FRONTEND=noninteractive

Expand All @@ -38,7 +38,7 @@ RUN set -ex; \
libboost-filesystem-dev libboost-test-dev libboost-system-dev \
libboost-program-options-dev \
clang \
libz3-static-dev \
libz3-static-dev jq \
; \
rm -rf /var/lib/apt/lists/*

Expand Down