Skip to content

Update Ubuntu container and bump OpenSSL version #307

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

Merged
dcillera merged 2 commits into from
Apr 2, 2025
Merged

Update Ubuntu container and bump OpenSSL version #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f10f192
Update Ubuntu container
dcillera Apr 1, 2025
ae08ddd
Bump OpenSSL 3.0.16
dcillera Apr 2, 2025
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
6 changes: 3 additions & 3 deletions bssl-compat/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ if(POLICY CMP0135)
cmake_policy(SET CMP0135 NEW)
endif()

set(OPENSSL_URL https://github.com/openssl/openssl/archive/refs/tags/openssl-3.0.13.tar.gz)
set(OPENSSL_URL_HASH e74504ed7035295ec7062b1da16c15b57ff2a03cd2064a28d8c39458cacc45fc)
set(OPENSSL_URL https://github.com/openssl/openssl/archive/refs/tags/openssl-3.0.16.tar.gz)
set(OPENSSL_URL_HASH 9642aa3d97ac37da45dadabb3b576f399016acdb1df5d0e2751733e1cdf9f328)

set(CMAKE_C_STANDARD 11)
set(CMAKE_CXX_STANDARD 17)
Expand Down Expand Up @@ -712,4 +712,4 @@ if(BUILD_BORINGSSL)
target_link_libraries(utests-boring PRIVATE BoringSSL::SSL BoringSSL::Crypto)
target_link_libraries(utests-boring PRIVATE GTest::gtest_main)
gtest_discover_tests(utests-boring)
endif(BUILD_BORINGSSL)
endif(BUILD_BORINGSSL)
5 changes: 3 additions & 2 deletions openssl/run_envoy_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ docker build --pull --iidfile "${SCRATCH_DIR}/iid" -f - "${SCRATCH_DIR}" << EOF
# Install the missing Kitware public key
RUN wget -qO- https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor - > /usr/share/keyrings/kitware-archive-keyring.gpg
RUN sed -i "s|^deb.*kitware.*$|deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ \$(lsb_release -cs) main|g" /etc/apt/sources.list
RUN wget -q -O - https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_20.04/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/devel_kubic_libcontainers_stable.gpg > /dev/null
RUN apt update

# Install OpenSSL 3.0.x
ENV OPENSSL_VERSION=3.0.8
ENV OPENSSL_VERSION=3.0.16
ENV OPENSSL_ROOTDIR=/usr/local/openssl-\$OPENSSL_VERSION
RUN apt install -y build-essential checkinstall zlib1g-dev
RUN wget -qO- https://github.com/openssl/openssl/releases/download/openssl-\$OPENSSL_VERSION/openssl-\$OPENSSL_VERSION.tar.gz | tar xz -C /
Expand All @@ -40,4 +41,4 @@ export IMAGE_NAME=$(cat "${SCRATCH_DIR}/iid" | cut -d ":" -f 1)
export IMAGE_ID=$(cat "${SCRATCH_DIR}/iid" | cut -d ":" -f 2)

# Hand off to the upstream run_envoy_docker.sh script
exec ./ci/run_envoy_docker.sh "$@"
exec ./ci/run_envoy_docker.sh "$@"