From 402b21c2e961b5294107808bdca065890d3c1539 Mon Sep 17 00:00:00 2001 From: Eddy Ashton Date: Tue, 4 Feb 2025 11:45:03 +0000 Subject: [PATCH] Try to install the correct curl, and not to uninstall it (#6799) --- cmake/cpack_settings.cmake | 2 +- docker/app_run | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/cpack_settings.cmake b/cmake/cpack_settings.cmake index 557927c81aee..071333008383 100644 --- a/cmake/cpack_settings.cmake +++ b/cmake/cpack_settings.cmake @@ -24,7 +24,7 @@ message(STATUS "Debian package version: ${CPACK_DEBIAN_PACKAGE_VERSION}") # 1.1.1f, which corresponds to the OpenSSL 1.1.1t release (latest security # patches). set(CCF_DEB_BASE_DEPENDENCIES - "libuv1 (>= 1.34.2);openssl (>=1.1.1f);libnghttp2-14 (>=1.40.0);curl (>=7.68.0);libstdc++6 (>=11.0.0)" + "libuv1 (>= 1.34.2);openssl (>=1.1.1f);libnghttp2-14 (>=1.40.0);libcurl4 (>=7.68.0);libstdc++6 (>=11.0.0)" ) set(CCF_DEB_DEPENDENCIES ${CCF_DEB_BASE_DEPENDENCIES}) diff --git a/docker/app_run b/docker/app_run index 12b4e34b86ca..ea443bb22843 100644 --- a/docker/app_run +++ b/docker/app_run @@ -15,6 +15,6 @@ RUN apt update \ && cd /tmp/setup_vm \ && ansible-playbook app-run.yml --extra-vars "$ansible_vars" --extra-vars "platform=${platform}" --extra-vars "clang_version=${clang_version}"\ && rm -rf /tmp/* \ - && apt remove -y ansible software-properties-common curl \ + && apt remove -y ansible software-properties-common \ && apt -y autoremove \ && apt -y clean \ No newline at end of file