From 357b0bd3d9058ef968682782a295cc5b51a15d73 Mon Sep 17 00:00:00 2001 From: Dennis Melzer Date: Wed, 24 Apr 2024 14:39:33 +0200 Subject: [PATCH 1/2] Update Dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index bb6814d..3b4bb0b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 @@ -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 From 96b0278f0d61b08e29547b68d098f30c12b08864 Mon Sep 17 00:00:00 2001 From: Dennis Melzer Date: Wed, 24 Apr 2024 14:42:19 +0200 Subject: [PATCH 2/2] Update custom_entrypoint --- custom_entrypoint | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/custom_entrypoint b/custom_entrypoint index adbf326..a93a0b2 100755 --- a/custom_entrypoint +++ b/custom_entrypoint @@ -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