From 6e94ea774d5a36d20994907d513ba7482c5317c1 Mon Sep 17 00:00:00 2001 From: Peter Somogyvari Date: Sat, 20 Jan 2024 12:30:17 -0800 Subject: [PATCH] build(weaver/core/relay): fix container image build due to OpenSSL version Fixes #2996 Signed-off-by: Peter Somogyvari --- weaver/core/relay/Dockerfile | 4 ++-- weaver/core/relay/Dockerfile.client | 2 +- weaver/core/relay/Dockerfile.driver | 2 +- weaver/core/relay/Dockerfile.server | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/weaver/core/relay/Dockerfile b/weaver/core/relay/Dockerfile index fb61a40afc..dedecfef0c 100644 --- a/weaver/core/relay/Dockerfile +++ b/weaver/core/relay/Dockerfile @@ -20,8 +20,8 @@ COPY . /opt/relay # Build OpenSSL -ENV SSL_VERSION=1.1.1f - +ENV SSL_VERSION=1.1.1w + # https://www.openssl.org/source/openssl-1.1.1w.tar.gz RUN ln -s /usr/include/x86_64-linux-gnu/asm /usr/include/x86_64-linux-musl/asm && \ ln -s /usr/include/asm-generic /usr/include/x86_64-linux-musl/asm-generic && \ ln -s /usr/include/linux /usr/include/x86_64-linux-musl/linux diff --git a/weaver/core/relay/Dockerfile.client b/weaver/core/relay/Dockerfile.client index bb9af67674..8749eb74ad 100644 --- a/weaver/core/relay/Dockerfile.client +++ b/weaver/core/relay/Dockerfile.client @@ -20,7 +20,7 @@ COPY . /opt/relay # Build OpenSSL -ENV SSL_VERSION=1.1.1f +ENV SSL_VERSION=1.1.1w RUN ln -s /usr/include/x86_64-linux-gnu/asm /usr/include/x86_64-linux-musl/asm && \ ln -s /usr/include/asm-generic /usr/include/x86_64-linux-musl/asm-generic && \ diff --git a/weaver/core/relay/Dockerfile.driver b/weaver/core/relay/Dockerfile.driver index c8cf89d0fc..99ada3c02b 100644 --- a/weaver/core/relay/Dockerfile.driver +++ b/weaver/core/relay/Dockerfile.driver @@ -20,7 +20,7 @@ COPY . /opt/relay # Build OpenSSL -ENV SSL_VERSION=1.1.1f +ENV SSL_VERSION=1.1.1w RUN ln -s /usr/include/x86_64-linux-gnu/asm /usr/include/x86_64-linux-musl/asm && \ ln -s /usr/include/asm-generic /usr/include/x86_64-linux-musl/asm-generic && \ diff --git a/weaver/core/relay/Dockerfile.server b/weaver/core/relay/Dockerfile.server index 31e317e7a4..9526b59b8b 100644 --- a/weaver/core/relay/Dockerfile.server +++ b/weaver/core/relay/Dockerfile.server @@ -18,7 +18,7 @@ COPY . /opt/relay # Build OpenSSL -ENV SSL_VERSION=1.1.1f +ENV SSL_VERSION=1.1.1w RUN ln -s /usr/include/x86_64-linux-gnu/asm /usr/include/x86_64-linux-musl/asm && \ ln -s /usr/include/asm-generic /usr/include/x86_64-linux-musl/asm-generic && \