Updated to haproxy 3.0.6, aws-lc v1.38.0

robvanoostenrijk · Nov 8, 2024 · 538eb03 · 538eb03
1 parent d56d8f8
commit 538eb03
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,12 +3,12 @@ FROM alpine:latest AS builder
 
 ARG SSL_LIBRARY
 
-ARG AWS_LC_TAG=v1.37.0 \
+ARG AWS_LC_TAG=v1.38.0 \
 	LIBRESSL_TAG=v3.9.2 \
 	OPENSSL_TAG=openssl-3.4.0 \
-	WOLFSSL_TAG=v5.7.2 \
+	WOLFSSL_TAG=v5.7.4 \
 	LIBSLZ_TAG=v1.2.1 \
-	HAPROXY_VERSION=3.0.5
+	HAPROXY_VERSION=3.0.6
 
 COPY --link ["scratchfs", "/scratchfs"]
 

diff --git a/Dockerfile.body b/Dockerfile.body
@@ -1,4 +1,3 @@
-	HAPROXY_VERSION=3.0.5
 
 COPY --link ["scratchfs", "/scratchfs"]
 

diff --git a/scripts/build-dockerfile.sh b/scripts/build-dockerfile.sh
@@ -11,6 +11,7 @@ ARG AWS_LC_TAG=${AWS_LC_TAG} \\
 	OPENSSL_TAG=${OPENSSL_TAG} \\
 	WOLFSSL_TAG=${WOLFSSL_TAG} \\
 	LIBSLZ_TAG=${LIBSLZ_TAG} \\
+	HAPROXY_VERSION=${HAPROXY_VERSION}
 EOF
 
 cat Dockerfile.body >> Dockerfile
diff --git a/scripts/update_versions.sh b/scripts/update_versions.sh
@@ -8,10 +8,11 @@ get_latest_tag()
 }
 
 # Generate versions.env (shell env format)
-cat <<- EOF >> versions.env
+cat <<- EOF > versions.env
 	AWS_LC_TAG=v$(get_latest_tag aws/aws-lc v)
 	LIBRESSL_TAG=v$(get_latest_tag libressl/portable v)
 	OPENSSL_TAG=openssl-$(get_latest_tag openssl/openssl openssl)
 	WOLFSSL_TAG=v$(get_latest_tag wolfSSL/wolfssl v)
 	LIBSLZ_TAG=v$(get_latest_tag wtarreau/libslz v)
+	HAPROXY_VERSION=3.0.6
 EOF
diff --git a/versions.env b/versions.env
@@ -1,5 +1,6 @@
-AWS_LC_TAG=v1.37.0
+AWS_LC_TAG=v1.38.0
 LIBRESSL_TAG=v4.0.0
 OPENSSL_TAG=openssl-3.4.0
-WOLFSSL_TAG=v5.7.2
+WOLFSSL_TAG=v5.7.4
 LIBSLZ_TAG=v1.2.1
+HAPROXY_VERSION=3.0.6
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@
		HAPROXY_VERSION=3.0.5

		COPY --link ["scratchfs", "/scratchfs"]

Expand Down