From d487533e7a0bffcbdd766a65565b6d76421059b2 Mon Sep 17 00:00:00 2001
From: Nikos Tsipinakis <nikos@tsipinakis.com>
Date: Sun, 7 Jan 2024 15:32:33 +0100
Subject: [PATCH] Fix build with new Alpine versions

libssl1.1 and libcrypto1.1 are not available in the latest alpine, use
version 3 instead.
---
 containerssh-test-authconfig/Dockerfile | 4 ++--
 containerssh/Dockerfile                 | 4 ++--
 sut/Dockerfile                          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/containerssh-test-authconfig/Dockerfile b/containerssh-test-authconfig/Dockerfile
index 831a688..f8fb6e9 100644
--- a/containerssh-test-authconfig/Dockerfile
+++ b/containerssh-test-authconfig/Dockerfile
@@ -32,7 +32,7 @@ USER 0:0
 RUN chown -R root:root /containerssh
 
 FROM alpine
-RUN apk upgrade --no-cache && apk add --no-cache 'libssl1.1>=1.1.1k-r0' 'libcrypto1.1>=1.1.1k-r0'
+RUN apk upgrade --no-cache && apk add --no-cache 'libssl3' 'libcrypto3'
 COPY --from=download /containerssh/containerssh-testauthconfigserver /
 COPY --from=download /containerssh/LICENSE* /
 COPY --from=download /containerssh/NOTICE* /
@@ -40,4 +40,4 @@ RUN chmod +x /containerssh-testauthconfigserver
 ENTRYPOINT ["/containerssh-testauthconfigserver"]
 CMD []
 USER 1080:1080
-EXPOSE 8080
\ No newline at end of file
+EXPOSE 8080
diff --git a/containerssh/Dockerfile b/containerssh/Dockerfile
index d135da9..c891557 100644
--- a/containerssh/Dockerfile
+++ b/containerssh/Dockerfile
@@ -20,7 +20,7 @@ RUN cd /containerssh && \
     if [ -n "${GITHUB_TOKEN}" ]; then \
         curl -L -o containerssh.tar.gz --header 'authorization: Bearer ${GITHUB_TOKEN}' ${URL}; \
     else \
-        curl -L -o containerssh.tar.gz ${URL}; \
+        curl -vvvvv -L -o containerssh.tar.gz ${URL}; \
     fi && \
     tar -xvvzf containerssh.tar.gz && \
     rm containerssh.tar.gz
@@ -28,7 +28,7 @@ USER 0:0
 RUN chown -R root:root /containerssh
 
 FROM alpine
-RUN apk upgrade --no-cache && apk add --no-cache 'libssl1.1>=1.1.1k-r0' 'libcrypto1.1>=1.1.1k-r0'
+RUN apk upgrade --no-cache && apk add --no-cache 'libssl3' 'libcrypto3'
 COPY --from=download /containerssh/containerssh /
 COPY --from=download /containerssh/LICENSE* /
 COPY --from=download /containerssh/NOTICE* /
diff --git a/sut/Dockerfile b/sut/Dockerfile
index a150321..4f0d87b 100644
--- a/sut/Dockerfile
+++ b/sut/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine
 
-RUN apk upgrade --no-cache && apk add --no-cache 'libssl1.1>=1.1.1k-r0' 'libcrypto1.1>=1.1.1k-r0'
+RUN apk upgrade --no-cache && apk add --no-cache 'libssl3' 'libcrypto3'
 RUN apk add --no-cache openssh sshpass nmap
 ADD test.sh /test.sh
 RUN chmod +x /test.sh
-CMD ["/test.sh"]
\ No newline at end of file
+CMD ["/test.sh"]