Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(cmake,docker): avoid cpp-httplib requiring brotli. #3400

Merged
merged 1 commit into from
Nov 7, 2024
Merged

fix(cmake,docker): avoid cpp-httplib requiring brotli. #3400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cmake/modules/cpp-httplib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 1 addition & 9 deletions docker/falco/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 /

Expand Down
Loading