Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 2, 2021
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fc9c8da
Update Curl version to 7.77.0
preearor Jun 1, 2021
15997ef
Update Dockerfile.musl
carlzogh Jun 2, 2021
e72f108
Merge branch 'master' into master
carlzogh Jun 2, 2021
72582c6
Merge branch 'master' into master
carlzogh Jun 2, 2021
0c2ec68
Merge branch 'master' into master
carlzogh Jun 2, 2021
53071c8
Merge branch 'master' into master
carlzogh Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
5 changes: 4 additions & 1 deletion aws-lambda-java-runtime-interface-client/src/main/jni/Dockerfile.glibc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 \
Expand Down
6 changes: 5 additions & 1 deletion aws-lambda-java-runtime-interface-client/src/main/jni/Dockerfile.musl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -16,7 +18,9 @@ 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
RUN ls /src/deps/curl
WORKDIR /src/deps/curl
RUN ./configure \
--prefix $(pwd)/../artifacts \
Expand Down
5 changes: 3 additions & 2 deletions aws-lambda-java-runtime-interface-client/src/main/jni/build-jni-lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Loading