diff --git a/Server/Source/CMakeLists.txt b/Server/Source/CMakeLists.txt index e74713bce..914e7d748 100644 --- a/Server/Source/CMakeLists.txt +++ b/Server/Source/CMakeLists.txt @@ -35,7 +35,7 @@ if(MSVC) winmm ) else() - target_link_libraries(Server PRIVATE dl) + target_link_libraries(Server PRIVATE dl atomic) if(SHARED_STDCXXFS) target_link_libraries(Server PRIVATE stdc++fs) diff --git a/docker/run_ubuntu-22.04/Dockerfile b/docker/run_ubuntu-22.04/Dockerfile index f7f5dbbdd..75d55f27f 100644 --- a/docker/run_ubuntu-22.04/Dockerfile +++ b/docker/run_ubuntu-22.04/Dockerfile @@ -7,20 +7,9 @@ RUN \ wget \ libstdc++6:i386 \ tzdata \ - && \ - wget \ - http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.16_i386.deb \ - -P /tmp \ - && \ - dpkg -i /tmp/libssl1.1_1.1.1f-1ubuntu2.16_i386.deb && \ - wget \ - http://security.ubuntu.com/ubuntu/pool/main/o/openssl/openssl_1.1.1f-1ubuntu2.16_i386.deb \ - -P /tmp \ - && \ - dpkg -i /tmp/openssl_1.1.1f-1ubuntu2.16_i386.deb && \ - rm \ - /tmp/libssl1.1_1.1.1f-1ubuntu2.16_i386.deb \ - /tmp/openssl_1.1.1f-1ubuntu2.16_i386.deb \ + openssl \ + libssl3 \ + libssl-dev \ && \ useradd -m user diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index ba055eb2f..2c12d9f24 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -118,10 +118,10 @@ conan_omp_add_lib(nlohmann_json 3.9.1) # ------- if(SHARED_OPENSSL) message("Using shared OpenSSL") - conan_omp_add_lib_opt(openssl 1.1.1q "openssl:shared=True") + conan_omp_add_lib_opt(openssl 3.0.13 "openssl:shared=True") else() message("Using static OpenSSL") - conan_omp_add_lib(openssl 1.1.1q) + conan_omp_add_lib(openssl 3.0.13) endif() # ghc-filesystem