Skip to content

Commit 93920ad

Browse files
committed
catch up to may 2024 images
1 parent 1da1589 commit 93920ad

File tree

3 files changed

+3
-15
lines changed

3 files changed

+3
-15
lines changed

Dockerfile

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ RUN conda-pack -n ${CONDA_ENV_NAME} --dest-prefix=/var/task -o /tmp/env.tar && \
3131
mkdir /venv && cd /venv && tar xf /tmp/env.tar && \
3232
rm /tmp/env.tar
3333

34-
#al2.2022.03.02.08
35-
#FROM --platform=$TARGETPLATFORM amazon/aws-lambda-provided:al2 as al2
36-
3734

3835
FROM --platform=$TARGETPLATFORM ${LAMBDA_IMAGE:?} as al2
3936

@@ -54,16 +51,9 @@ COPY --from=condasetup /venv ${CONDAENV}
5451
ENV PROJ_LIB ${CONDAENV}/share/proj
5552
ENV PROJ_NETWORK=TRUE
5653
ENV PATH $PATH:${CONDAENV}/bin
57-
ENV DTED_APPLY_PIXEL_IS_POINT=TRUE
58-
ENV GTIFF_REPORT_COMPD_CS=TRUE
59-
ENV REPORT_COMPD_CS=TRUE
60-
ENV OAMS_TRADITIONAL_GIS_ORDER=TRUE
61-
ENV XDG_DATA_HOME=${CONDAENV}/share
6254
ENV LD_LIBRARY_PATH=${CONDAENV}/lib
63-
# we're running our own conda one
64-
RUN rm /usr/bin/python
6555

66-
RUN python -m pip install awslambdaric==2.0.8
56+
RUN /var/task/bin/python -m pip install awslambdaric==2.0.11
6757
ADD https://github.com/aws/aws-lambda-runtime-interface-emulator/releases/latest/download/aws-lambda-rie-${RIE_ARCH} /usr/bin/aws-lambda-rie
6858

6959
RUN chmod +x /usr/bin/aws-lambda-rie

build.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ then
3030
fi
3131

3232
CONTAINER_NAME=$identity.dkr.ecr.$region.amazonaws.com/$container
33-
#CONTAINER_NAME=public.ecr.aws/d4n0a3t5/$container
34-
3533

3634
LAMBDA_IMAGE="amazon/aws-lambda-provided:al2"
3735
docker buildx build -t $CONTAINER_NAME:amd64 . \
@@ -40,7 +38,7 @@ docker buildx build -t $CONTAINER_NAME:amd64 . \
4038
--platform linux/amd64 \
4139
-f Dockerfile --load
4240

43-
LAMBDA_IMAGE="amazon/aws-lambda-provided:al2.2023.12.14.13"
41+
LAMBDA_IMAGE="amazon/aws-lambda-provided:al2023.2024.05.01.10"
4442
docker buildx build -t $CONTAINER_NAME:arm64 . \
4543
-f Dockerfile --platform linux/arm64 \
4644
--build-arg LAMBDA_IMAGE=$LAMBDA_IMAGE \

pdal_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def gatherImage(filename):
3131
try:
3232
outs, errs = job.communicate(timeout=15)
3333
logger.error(errs)
34-
except TimeoutExpired:
34+
except subprocess.TimeoutExpired:
3535
job.kill()
3636
outs, errs = job.communicate()
3737
logger.error(errs)

0 commit comments

Comments
 (0)