Update Docker images.

This commit is contained in:
Daniel Kirchner 2020-05-13 18:16:21 +02:00
parent a7f6a4bee6
commit b56536aeb2
3 changed files with 11 additions and 5 deletions

View File

@ -12,10 +12,10 @@ parameters:
default: "4" default: "4"
ubuntu-2004-docker-image-rev: ubuntu-2004-docker-image-rev:
type: string type: string
default: "1" default: "2"
ubuntu-2004-clang-docker-image-rev: ubuntu-2004-clang-docker-image-rev:
type: string type: string
default: "1" default: "2"
ubuntu-1604-clang-ossfuzz-docker-image-rev: ubuntu-1604-clang-ossfuzz-docker-image-rev:
type: string type: string
default: "2" default: "2"

View File

@ -26,6 +26,9 @@ FROM buildpack-deps:focal AS base
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
RUN set -ex; \ RUN set -ex; \
dist=$(grep DISTRIB_CODENAME /etc/lsb-release | cut -d= -f2); \
echo "deb http://ppa.launchpad.net/ethereum/cpp-build-deps/ubuntu $dist main" >> /etc/apt/sources.list ; \
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 \
@ -33,7 +36,7 @@ RUN set -ex; \
cmake ninja-build \ cmake ninja-build \
libboost-filesystem-dev libboost-test-dev libboost-system-dev \ libboost-filesystem-dev libboost-test-dev libboost-system-dev \
libboost-program-options-dev \ libboost-program-options-dev \
libcvc4-dev z3 libz3-dev \ libcvc4-dev libz3-static-dev \
; \ ; \
apt-get install -qy python3-pip python3-sphinx; \ apt-get install -qy python3-pip python3-sphinx; \
pip3 install codecov; \ pip3 install codecov; \

View File

@ -26,6 +26,9 @@ FROM buildpack-deps:focal AS base
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
RUN set -ex; \ RUN set -ex; \
dist=$(grep DISTRIB_CODENAME /etc/lsb-release | cut -d= -f2); \
echo "deb http://ppa.launchpad.net/ethereum/cpp-build-deps/ubuntu $dist main" >> /etc/apt/sources.list ; \
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 \
@ -33,8 +36,8 @@ RUN set -ex; \
cmake ninja-build \ cmake ninja-build \
libboost-filesystem-dev libboost-test-dev libboost-system-dev \ libboost-filesystem-dev libboost-test-dev libboost-system-dev \
libboost-program-options-dev \ libboost-program-options-dev \
clang llvm-dev \ clang \
z3 libz3-dev \ libz3-static-dev \
; \ ; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*