Merge pull request #307 from dcillera/update-ubuntu

Update Ubuntu container

Author: dcillera

bssl-compat/CMakeLists.txt

@@ -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)
@@ -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)

openssl/run_envoy_docker.sh

@@ -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 /
@@ -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 "$@"