From b56536aeb27ed892ea9960e7264f16337a395be8 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 13 May 2020 18:16:21 +0200
Subject: [PATCH] Update Docker images.

---
 .circleci/config.yml                         | 4 ++--
 .circleci/docker/Dockerfile.ubuntu2004       | 5 ++++-
 .circleci/docker/Dockerfile.ubuntu2004.clang | 7 +++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 49f78fa19..0620cd667 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,10 +12,10 @@ parameters:
     default: "4"
   ubuntu-2004-docker-image-rev:
     type: string
-    default: "1"
+    default: "2"
   ubuntu-2004-clang-docker-image-rev:
     type: string
-    default: "1"
+    default: "2"
   ubuntu-1604-clang-ossfuzz-docker-image-rev:
     type: string
     default: "2"
diff --git a/.circleci/docker/Dockerfile.ubuntu2004 b/.circleci/docker/Dockerfile.ubuntu2004
index d39025809..a021b6533 100644
--- a/.circleci/docker/Dockerfile.ubuntu2004
+++ b/.circleci/docker/Dockerfile.ubuntu2004
@@ -26,6 +26,9 @@ FROM buildpack-deps:focal AS base
 ARG DEBIAN_FRONTEND=noninteractive
 
 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 install -qqy --no-install-recommends \
 		build-essential \
@@ -33,7 +36,7 @@ RUN set -ex; \
 		cmake ninja-build \
 		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
 		libboost-program-options-dev \
-		libcvc4-dev z3 libz3-dev \
+		libcvc4-dev libz3-static-dev \
 		; \
 	apt-get install -qy python3-pip python3-sphinx; \
 	pip3 install codecov; \
diff --git a/.circleci/docker/Dockerfile.ubuntu2004.clang b/.circleci/docker/Dockerfile.ubuntu2004.clang
index f436c34b7..c8d057eb1 100644
--- a/.circleci/docker/Dockerfile.ubuntu2004.clang
+++ b/.circleci/docker/Dockerfile.ubuntu2004.clang
@@ -26,6 +26,9 @@ FROM buildpack-deps:focal AS base
 ARG DEBIAN_FRONTEND=noninteractive
 
 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 install -qqy --no-install-recommends \
 		build-essential \
@@ -33,8 +36,8 @@ RUN set -ex; \
 		cmake ninja-build \
 		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
 		libboost-program-options-dev \
-		clang llvm-dev \
-		z3 libz3-dev \
+		clang \
+		libz3-static-dev \
 		; \
 	rm -rf /var/lib/apt/lists/*