Merge pull request #14228 from ethereum/add-sudo-base-imgs

Add sudo to buildpack-deps images
This commit is contained in:
r0qs 2023-05-22 11:53:35 +02:00 committed by GitHub
commit 6ea033b7e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 10 deletions

View File

@ -33,13 +33,13 @@
# Using $(em-config CACHE)/sysroot/usr seems to work, though, and still has cmake find the # Using $(em-config CACHE)/sysroot/usr seems to work, though, and still has cmake find the
# dependencies automatically. # dependencies automatically.
FROM emscripten/emsdk:3.1.19 AS base FROM emscripten/emsdk:3.1.19 AS base
LABEL version="15" LABEL version="16"
ADD emscripten.jam /usr/src ADD emscripten.jam /usr/src
RUN set -ex && \ RUN set -ex && \
\ \
apt-get update && \ apt-get update && \
apt-get install lz4 --no-install-recommends && \ apt-get install lz4 sudo --no-install-recommends && \
\ \
cd /usr/src && \ cd /usr/src && \
git clone https://github.com/Z3Prover/z3.git -b z3-4.12.1 --depth 1 && \ git clone https://github.com/Z3Prover/z3.git -b z3-4.12.1 --depth 1 && \

View File

@ -22,13 +22,13 @@
# (c) 2016-2021 solidity contributors. # (c) 2016-2021 solidity contributors.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
FROM gcr.io/oss-fuzz-base/base-clang:latest as base FROM gcr.io/oss-fuzz-base/base-clang:latest as base
LABEL version="1" LABEL version="2"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update; \ RUN apt-get update; \
apt-get -qqy install --no-install-recommends \ apt-get -qqy install --no-install-recommends \
build-essential \ build-essential sudo \
software-properties-common \ software-properties-common \
ninja-build git wget \ ninja-build git wget \
libbz2-dev zlib1g-dev git curl uuid-dev \ libbz2-dev zlib1g-dev git curl uuid-dev \

View File

@ -22,7 +22,7 @@
# (c) 2016-2019 solidity contributors. # (c) 2016-2019 solidity contributors.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
FROM buildpack-deps:focal AS base FROM buildpack-deps:focal AS base
LABEL version="19" LABEL version="20"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@ -32,7 +32,7 @@ RUN set -ex; \
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1c52189c923f6ca9 ; \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1c52189c923f6ca9 ; \
apt-get update; \ apt-get update; \
apt-get install -qqy --no-install-recommends \ apt-get install -qqy --no-install-recommends \
build-essential \ build-essential sudo \
software-properties-common \ software-properties-common \
cmake ninja-build \ cmake ninja-build \
libboost-filesystem-dev libboost-test-dev libboost-system-dev \ libboost-filesystem-dev libboost-test-dev libboost-system-dev \

View File

@ -22,7 +22,7 @@
# (c) 2016-2019 solidity contributors. # (c) 2016-2019 solidity contributors.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
FROM buildpack-deps:jammy AS base FROM buildpack-deps:jammy AS base
LABEL version="4" LABEL version="5"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@ -32,7 +32,7 @@ RUN set -ex; \
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1c52189c923f6ca9 ; \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1c52189c923f6ca9 ; \
apt-get update; \ apt-get update; \
apt-get install -qqy --no-install-recommends \ apt-get install -qqy --no-install-recommends \
build-essential \ build-essential sudo \
software-properties-common \ software-properties-common \
cmake ninja-build \ cmake ninja-build \
libboost-filesystem-dev libboost-test-dev libboost-system-dev \ libboost-filesystem-dev libboost-test-dev libboost-system-dev \

View File

@ -22,7 +22,7 @@
# (c) 2016-2019 solidity contributors. # (c) 2016-2019 solidity contributors.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
FROM buildpack-deps:jammy AS base FROM buildpack-deps:jammy AS base
LABEL version="3" LABEL version="4"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@ -32,7 +32,7 @@ RUN set -ex; \
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1c52189c923f6ca9 ; \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1c52189c923f6ca9 ; \
apt-get update; \ apt-get update; \
apt-get install -qqy --no-install-recommends \ apt-get install -qqy --no-install-recommends \
build-essential \ build-essential sudo \
software-properties-common \ software-properties-common \
cmake ninja-build \ cmake ninja-build \
libboost-filesystem-dev libboost-test-dev libboost-system-dev \ libboost-filesystem-dev libboost-test-dev libboost-system-dev \