Skip to content

Commit 320b6e3

Browse files
Apply the change to the dependencies
1 parent 2a95e6b commit 320b6e3

File tree

4 files changed

+13
-20
lines changed

4 files changed

+13
-20
lines changed

deps/curl-7.83.1.tar.gz

59.9 KB
Binary file not shown.

scripts/patch_libcurl_config.sh

-15
This file was deleted.

scripts/update_deps.sh

+12-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,24 @@
11
#!/bin/bash
22
# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3-
set -e
3+
set -x
44

55
cd deps
66
source versions
77

88
# Clean up old files
99
rm -f aws-lambda-cpp-*.tar.gz && rm -f curl-*.tar.gz
1010

11+
12+
LIBCURL="curl-${CURL_MAJOR_VERSION}.${CURL_MINOR_VERSION}.${CURL_PATCH_VERSION}"
13+
1114
# Grab Curl
12-
wget -c "https://github.com/curl/curl/releases/download/curl-${CURL_MAJOR_VERSION}_${CURL_MINOR_VERSION}_${CURL_PATCH_VERSION}/curl-${CURL_MAJOR_VERSION}.${CURL_MINOR_VERSION}.${CURL_PATCH_VERSION}.tar.gz"
15+
wget -c "https://github.com/curl/curl/releases/download/curl-${CURL_MAJOR_VERSION}_${CURL_MINOR_VERSION}_${CURL_PATCH_VERSION}/$LIBCURL.tar.gz" -O - | tar -xz
16+
(
17+
cd $LIBCURL && \
18+
patch -p1 < ../patches/libcurl-configure-template.patch
19+
)
20+
21+
tar -czf $LIBCURL.tar.gz $LIBCURL --no-same-owner && rm -rf $LIBCURL
1322

1423
# Grab aws-lambda-cpp
1524
wget -c https://github.com/awslabs/aws-lambda-cpp/archive/v$AWS_LAMBDA_CPP_RELEASE.tar.gz -O - | tar -xz
@@ -25,5 +34,5 @@ wget -c https://github.com/awslabs/aws-lambda-cpp/archive/v$AWS_LAMBDA_CPP_RELEA
2534
)
2635

2736
## Pack again and remove the folder
28-
tar -czvf aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE.tar.gz aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE --no-same-owner && \
37+
tar -czf aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE.tar.gz aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE --no-same-owner && \
2938
rm -rf aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE

tests/integration/docker/Dockerfile.echo.alpine

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ RUN mkdir -p ${RIC_BUILD_DIR}
3131
# Copy function code and Runtime Interface Client .tgz
3232
WORKDIR ${RIC_BUILD_DIR}
3333
COPY . .
34-
RUN make init patch-libcurl-configure-template && \
35-
make build test && \
34+
RUN make init build test && \
3635
mv ./dist/awslambdaric-*.tar.gz ./dist/awslambdaric-test.tar.gz
3736

3837
# Include global args in this stage of the build

0 commit comments

Comments
 (0)