Skip to content

Commit b7c84ea

Browse files
committed
use sam build-python images
1 parent 6c8e28f commit b7c84ea

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

Dockerfile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ ARG runtime
77
RUN mkdir -p /build/python/lib/$runtime/site-packages
88
WORKDIR /build
99

10-
# Install GCC
10+
# Install newer version of GCC on AL2
1111
RUN set -eux; \
12-
if command -v dnf >/dev/null 2>&1; then \
13-
dnf -y install git gcc-c++; \
14-
else \
12+
if command -v yum >/dev/null 2>&1; then \
1513
yum -y install git gcc10 gcc10-c++; \
16-
ln -s /usr/bin/gcc10-gcc /usr/bin/gcc; \
17-
ln -s /usr/bin/gcc10-g++ /usr/bin/g++; \
18-
ln -s /usr/bin/gcc10-cc /usr/bin/cc; \
14+
cd /usr/bin; \
15+
rm gcc && ln -s gcc10-gcc gcc; \
16+
rm g++ && ln -s gcc10-g++ g++; \
17+
rm cc && ln -s gcc10-cc cc; \
1918
fi
2019

2120
# Add Rust compiler which is needed to build dd-trace-py from source

scripts/build_layers.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ function docker_build_zip {
6161
# between different python runtimes.
6262
temp_dir=$(mktemp -d)
6363
docker buildx build -t datadog-lambda-python-${arch}:$1 . --no-cache \
64-
--build-arg image=public.ecr.aws/lambda/python:$1 \
64+
--build-arg image=public.ecr.aws/sam/build-python$1 \
6565
--build-arg runtime=python$1 \
6666
--platform linux/${arch} \
6767
--progress=plain \

0 commit comments

Comments
 (0)