Skip to content

Commit

Permalink
Try to install the correct curl, and not to uninstall it (#6799)
Browse files Browse the repository at this point in the history
  • Loading branch information
eddyashton authored Feb 4, 2025
1 parent b5435a9 commit 402b21c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cmake/cpack_settings.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
2 changes: 1 addition & 1 deletion docker/app_run
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 402b21c

Please sign in to comment.