Update Curl version to 7.77.0, change libcurl distribution to tarball (aws#249)

Co-authored-by: Carl Zogheib <[email protected]>

Author: preearor

aws-lambda-java-runtime-interface-client/src/main/jni/Dockerfile.glibc

@@ -1,6 +1,8 @@
 # we use centos 7 to build against glibc 2.17
 FROM centos:7
 
+ARG CURL_VERSION
+
 # Add Corretto repository
 RUN rpm --import https://yum.corretto.aws/corretto.key && \
     curl -L -o /etc/yum.repos.d/corretto.repo https://yum.corretto.aws/corretto.repo
@@ -22,7 +24,8 @@ RUN yum install -y \
         java-1.8.0-amazon-corretto-devel
 
 # Install curl dependency
-ADD ./deps/curl-* /src/deps/curl
+COPY ./deps/curl-$CURL_VERSION.tar.gz /src/deps/
+RUN tar xzf /src/deps/curl-$CURL_VERSION.tar.gz -C /src/deps && mv /src/deps/curl-$CURL_VERSION /src/deps/curl
 WORKDIR /src/deps/curl
 RUN ./configure \
         --prefix $(pwd)/../artifacts \

aws-lambda-java-runtime-interface-client/src/main/jni/Dockerfile.musl

@@ -1,5 +1,7 @@
 FROM alpine:3
 
+ARG CURL_VERSION
+
 # Add Corretto repository
 RUN wget -O /etc/apk/keys/amazoncorretto.rsa.pub  https://apk.corretto.aws/amazoncorretto.rsa.pub && \
     echo "https://apk.corretto.aws/" >> /etc/apk/repositories
@@ -16,7 +18,8 @@ RUN apk update && \
         perl
 
 # Install curl dependency
-ADD ./deps/curl-* /src/deps/curl
+COPY ./deps/curl-$CURL_VERSION.tar.gz /src/deps/
+RUN tar xzf /src/deps/curl-$CURL_VERSION.tar.gz -C /src/deps && mv /src/deps/curl-$CURL_VERSION /src/deps/curl
 WORKDIR /src/deps/curl
 RUN ./configure \
         --prefix $(pwd)/../artifacts \

aws-lambda-java-runtime-interface-client/src/main/jni/build-jni-lib.sh

@@ -5,11 +5,12 @@ set -euo pipefail
 
 SRC_DIR=$(dirname "$0")
 DST_DIR=${1}
+CURL_VERSION=7.77.0
 
 # compile the native library
-docker build -f "${SRC_DIR}/Dockerfile.glibc" -t lambda-java-jni-lib-glibc "${SRC_DIR}"
+docker build -f "${SRC_DIR}/Dockerfile.glibc" --build-arg CURL_VERSION=${CURL_VERSION} -t lambda-java-jni-lib-glibc "${SRC_DIR}"
 docker run --rm --entrypoint /bin/cat lambda-java-jni-lib-glibc /src/aws-lambda-runtime-interface-client.so > "${DST_DIR}"/classes/aws-lambda-runtime-interface-client.glibc.so
 
-docker build -f "${SRC_DIR}/Dockerfile.musl" -t lambda-java-jni-lib-musl "${SRC_DIR}"
+docker build -f "${SRC_DIR}/Dockerfile.musl" --build-arg CURL_VERSION=${CURL_VERSION} -t lambda-java-jni-lib-musl "${SRC_DIR}"
 docker run --rm --entrypoint /bin/cat lambda-java-jni-lib-musl /src/aws-lambda-runtime-interface-client.so > "${DST_DIR}"/classes/aws-lambda-runtime-interface-client.musl.so