From 0a8526dd7baa522e6245af5d39178ccce7645119 Mon Sep 17 00:00:00 2001 From: Federico Di Pierro Date: Wed, 6 Nov 2024 17:38:06 +0100 Subject: [PATCH] fix(cmake,docker): avoid cpp-httplib requiring brotli. Signed-off-by: Federico Di Pierro --- cmake/modules/cpp-httplib.cmake | 2 ++ docker/falco/Dockerfile | 10 +--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/cmake/modules/cpp-httplib.cmake b/cmake/modules/cpp-httplib.cmake index 28c9de8fa9e..3af5cf8a09f 100644 --- a/cmake/modules/cpp-httplib.cmake +++ b/cmake/modules/cpp-httplib.cmake @@ -16,6 +16,8 @@ option(USE_BUNDLED_CPPHTTPLIB "Enable building of the bundled cpp-httplib" ${USE_BUNDLED_DEPS}) if(USE_BUNDLED_CPPHTTPLIB) + set(HTTPLIB_USE_BROTLI_IF_AVAILABLE OFF) + set(HTTPLIB_REQUIRE_BROTLI OFF) include(FetchContent) FetchContent_Declare( cpp-httplib diff --git a/docker/falco/Dockerfile b/docker/falco/Dockerfile index 1b6aef6c294..48a16c0fc50 100644 --- a/docker/falco/Dockerfile +++ b/docker/falco/Dockerfile @@ -14,15 +14,7 @@ ENV VERSION_BUCKET=${VERSION_BUCKET} ENV HOST_ROOT /host ENV HOME /root -RUN apk update && apk add \ - ca-certificates \ - libstdc++ \ - libelf \ - llibbrotlicommon1 \ - libbrotlidec1 \ - libbrotlienc1 \ - curl \ - jq +RUN apk update && apk add curl ca-certificates jq libelf libstdc++ WORKDIR /