Skip to content

Commit fc98941

Browse files
committed
Downgrade py27 Ubuntu, fix amzn2023 WORKDIR
1 parent dbb6c55 commit fc98941

File tree

5 files changed

+9
-11
lines changed

5 files changed

+9
-11
lines changed

amzn2023/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ENV PATH="/root/.cargo/bin:${PATH}"
99
RUN /root/.cargo/bin/rustup update \
1010
&& /root/.cargo/bin/rustup target add aarch64-unknown-linux-gnu
1111
RUN rustup default stable
12+
WORKDIR /var/task
1213

1314
ENV CRYPTEIA_BUILD_OS=amzn
1415
ENV CRYPTEIA_BUILD_TARGET=x86_64-unknown-linux-gnu

amzn2023/Dockerfile-arm64

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/amazonlinux/amazonlinux:2023-arm64
1+
FROM public.ecr.aws/amazonlinux/amazonlinux:2023
22

33
RUN dnf install -y gcc openssl-devel python3-pip
44
RUN dnf clean all
@@ -9,6 +9,7 @@ ENV PATH="/root/.cargo/bin:${PATH}"
99
RUN /root/.cargo/bin/rustup update \
1010
&& /root/.cargo/bin/rustup target add aarch64-unknown-linux-gnu
1111
RUN rustup default stable
12+
WORKDIR /var/task
1213

1314
ENV CRYPTEIA_BUILD_OS=amzn
1415
ENV CRYPTEIA_BUILD_TARGET=aarch64-unknown-linux-gnu

amzn2023/setup-arm64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -e
33

44
echo "== [amzn2023/Dockerfile-arm64] building... =="
5-
docker build --tag crypteia-lambda-amzn2023-arm64 --file amzn2023/Dockerfile-arm64 .
5+
docker build --platform=linux/arm64 --tag crypteia-lambda-amzn2023-arm64 --file amzn2023/Dockerfile-arm64 .
66

77
echo "== [amzn2023/Dockerfile-arm64] bin/setup =="
88
docker run \

amzn2023/test-arm64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ docker run \
99
--volume "${PWD}:/var/task" \
1010
--env TEST_LANG=node \
1111
--platform=linux/arm64 \
12-
crypteia-lambda-amzn202V3-arm64
12+
crypteia-lambda-amzn2023-arm64
1313

1414
echo "== [amzn2023/Dockerfile-test-arm64] lambda/runtime building... =="
1515
docker build --tag crypteia-lambda-amzn2023-test-arm64 --file amzn2023/Dockerfile-test-arm64 .

py27/Dockerfile-test

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:20.04
22

33
ENV SHELL=/bin/sh
44

5-
RUN apt-get update && apt-get install -y software-properties-common && add-apt-repository ppa:deadsnakes/ppa && apt-get update
6-
RUN apt-get install -y --no-install-recommends \
7-
ca-certificates \
8-
curl \
9-
libffi-dev \
10-
python2.7 \
11-
python2.7-dev \
5+
RUN apt update \
6+
&& apt-get install -y curl \
7+
&& apt-get install -y python2.7 python2.7-dev \
128
&& update-alternatives --install /usr/bin/python python /usr/bin/python2.7 2
139

1410
RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py \

0 commit comments

Comments
 (0)