From 6c4c99e4c119b4ad5d6bfe0b975ed51aef8366e1 Mon Sep 17 00:00:00 2001 From: Gautham Banasandra Date: Thu, 2 Jun 2022 17:14:09 +0530 Subject: [PATCH] HADOOP-18274. Use CMake 3.19.0 in Debian 10 * This PR installs CMake through the install-cmake.sh script from pkg-resolver rather than through apt in order to install CMake 3.19. --- dev-support/docker/Dockerfile_debian_10 | 1 + dev-support/docker/pkg-resolver/packages.json | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-support/docker/Dockerfile_debian_10 b/dev-support/docker/Dockerfile_debian_10 index 256f0d5786ab9f..ec3de11035cee4 100644 --- a/dev-support/docker/Dockerfile_debian_10 +++ b/dev-support/docker/Dockerfile_debian_10 @@ -82,6 +82,7 @@ ENV HADOOP_SKIP_YETUS_VERIFICATION true #### # Install packages #### +RUN pkg-resolver/install-cmake.sh debian:10 RUN pkg-resolver/install-spotbugs.sh debian:10 RUN pkg-resolver/install-boost.sh debian:10 RUN pkg-resolver/install-protobuf.sh debian:10 diff --git a/dev-support/docker/pkg-resolver/packages.json b/dev-support/docker/pkg-resolver/packages.json index afe8a7a32b107e..22255178346012 100644 --- a/dev-support/docker/pkg-resolver/packages.json +++ b/dev-support/docker/pkg-resolver/packages.json @@ -62,7 +62,6 @@ "centos:8": "clang" }, "cmake": { - "debian:10": "cmake", "ubuntu:focal": "cmake", "ubuntu:focal::arch64": "cmake" },