Skip to content

Commit

Permalink
Merge pull request #8 from MelleD/MelleD-patch-3
Browse files Browse the repository at this point in the history
Update Dockerfile
  • Loading branch information
MelleD authored Apr 24, 2024
2 parents 33ef96e + 96b0278 commit 576c247
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-buster as builder
FROM python:3.12-slim-bullseye as builder
WORKDIR /app
COPY ./haaska/haaska.py .
COPY ./haaska/config/config.json.sample ./config.json
Expand All @@ -7,13 +7,13 @@ RUN pip install -t . requests pysocks awslambdaric
FROM alpine:latest as tailscale
WORKDIR /app
COPY . ./
ENV TSFILE=tailscale_1.62.1_amd64.tgz
ENV TSFILE=tailscale_1.64.0_amd64.tgz
RUN wget https://pkgs.tailscale.com/stable/${TSFILE} && \
tar xzf ${TSFILE} --strip-components=1
COPY . ./


FROM public.ecr.aws/lambda/python:3.10
FROM public.ecr.aws/lambda/python:3.12
#can't test locally without it
ADD https://github.com/aws/aws-lambda-runtime-interface-emulator/releases/latest/download/aws-lambda-rie /usr/local/bin/aws-lambda-rie
RUN chmod 755 /usr/local/bin/aws-lambda-rie
Expand Down
4 changes: 2 additions & 2 deletions custom_entrypoint
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ if [ -z "${AWS_LAMBDA_RUNTIME_API}" ]; then
echo Start aws-lambda-rie
exec env ALL_PROXY="socks5://localhost:1055/" /usr/local/bin/aws-lambda-rie /var/lang/bin/python3.8 -m awslambdaric $@
else
echo Start python3.10 awslambdaric
exec env ALL_PROXY="socks5://localhost:1055/" /var/lang/bin/python3.10 -m awslambdaric $@
echo Start python awslambdaric
exec env ALL_PROXY="socks5://localhost:1055/" /var/lang/bin/python3.12 -m awslambdaric $@
fi

0 comments on commit 576c247

Please sign in to comment.