Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions 3.10/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN apt-get update && \
curl \
ca-certificates \
gnupg && \
pip3 install --no-cache-dir --upgrade pip==25.1.1 && \
pip3 install --no-cache-dir --upgrade pip && \
apt-get -q -y clean && \
rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/*

Expand All @@ -18,7 +18,7 @@ RUN mkdir -p /etc/apt/keyrings && \
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
apt-get update && \
apt-get install -y nodejs && \
npm install -g serverless@3.36.0 && \
npm install -g serverless@3.40.0 && \

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good update to Serverless Framework from 3.36.0 to 3.40.0. This brings bug fixes and improvements. However, consider the same pip version issue that exists in this file as well.

npm install -g [email protected] && \
apt-get -q -y clean && \
rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/*
Expand Down
4 changes: 2 additions & 2 deletions 3.11/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN apt-get update && \
curl \
ca-certificates \
gnupg && \
pip3 install --no-cache-dir --upgrade pip==25.1.1 && \
pip3 install --no-cache-dir --upgrade pip && \
apt-get -q -y clean && \
rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/*

Expand All @@ -18,7 +18,7 @@ RUN mkdir -p /etc/apt/keyrings && \
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
apt-get update && \
apt-get install -y nodejs && \
npm install -g serverless@3.36.0 && \
npm install -g serverless@3.40.0 && \

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Serverless Framework update from 3.36.0 to 3.40.0 is good and brings improvements. However, all Dockerfiles in this PR have the same pip version issue (25.1.1) that should be addressed consistently across all Python versions.

npm install -g [email protected] && \
apt-get -q -y clean && \
rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/*
Expand Down
4 changes: 2 additions & 2 deletions 3.12/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN apt-get update && \
curl \
ca-certificates \
gnupg && \
pip3 install --no-cache-dir --upgrade pip==25.1.1 && \
pip3 install --no-cache-dir --upgrade pip && \
apt-get -q -y clean && \
rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/*

Expand All @@ -18,7 +18,7 @@ RUN mkdir -p /etc/apt/keyrings && \
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
apt-get update && \
apt-get install -y nodejs && \
npm install -g serverless@3.36.0 && \
npm install -g serverless@3.40.0 && \
npm install -g [email protected] && \
apt-get -q -y clean && \
rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/*
Expand Down
28 changes: 28 additions & 0 deletions 3.13/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
FROM python:3.13-slim-bookworm

RUN apt-get update && \
apt-get install -y \
wget \
zip \
unzip \
git \
curl \
ca-certificates \
gnupg && \
pip3 install --no-cache-dir --upgrade pip && \
apt-get -q -y clean && \
rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/*

RUN mkdir -p /etc/apt/keyrings && \
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
apt-get update && \
apt-get install -y nodejs && \
npm install -g [email protected] && \
npm install -g [email protected] && \
apt-get -q -y clean && \
rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/*

WORKDIR /work

ENTRYPOINT ["/bin/sh"]

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛑 Critical Missing Update: The Makefile needs to be updated to include build and push commands for Python 3.13. Without this, the CI/CD pipeline won't build or publish the Python 3.13 image.

4 changes: 2 additions & 2 deletions 3.9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN apt-get update && \
curl \
ca-certificates \
gnupg && \
pip3 install --no-cache-dir --upgrade pip==25.1.1 && \
pip3 install --no-cache-dir --upgrade pip && \
apt-get -q -y clean && \
rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/*

Expand All @@ -18,7 +18,7 @@ RUN mkdir -p /etc/apt/keyrings && \
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
apt-get update && \
apt-get install -y nodejs && \
npm install -g serverless@3.36.0 && \
npm install -g serverless@3.40.0 && \
npm install -g [email protected] && \
apt-get -q -y clean && \
rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/*
Expand Down
11 changes: 10 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ build:
--build-arg base_image=python:3.12-slim-bookworm \
-t ${REPO}:3.12-${IMAGE_TAG} \
./3.12/.

# Python 3.13
docker build \
--build-arg base_image=python:3.13-slim-bookworm \
-t ${REPO}:3.13-${IMAGE_TAG} \
./3.13/.
push:
echo "Push specific tag/release"

Expand All @@ -38,4 +44,7 @@ push:
docker push ${REPO}:3.11-${IMAGE_TAG}

# Python 3.12
docker push ${REPO}:3.12-${IMAGE_TAG}
docker push ${REPO}:3.12-${IMAGE_TAG}

# Python 3.13
docker push ${REPO}:3.13-${IMAGE_TAG}
6 changes: 6 additions & 0 deletions test/build-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ docker build \
-t ${DOCKER_REPO}:3.12-${DOCKER_TAG} \
..

echo "Building Python 3.13..."

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good addition of Python 3.13 build to the test script. This ensures the new Docker image gets built and tested along with the existing versions. The formatting and structure are consistent with the existing build commands.

docker build \
-f ../3.13/Dockerfile \
-t ${DOCKER_REPO}:3.13-${DOCKER_TAG} \
..

echo "All builds completed successfully!"

# List the built images
Expand Down