Skip to content

[python] use last patch version of python for django weblogs #4025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
christophe-papazian merged 2 commits into from
Feb 10, 2025
Merged

[python] use last patch version of python for django weblogs #4025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fa1c40
[python] use last patch version of python for django weblogs
christophe-papazian Feb 10, 2025
7249352
update base image versions
christophe-papazian Feb 10, 2025
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
8 changes: 4 additions & 4 deletions utils/build/build_python_base_images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@



docker buildx build --load --progress=plain -f utils/build/docker/python/django-py3.13.base.Dockerfile -t datadog/system-tests:django-py3.13.base-v0 .
docker buildx build --load --progress=plain -f utils/build/docker/python/django-py3.13.base.Dockerfile -t datadog/system-tests:django-py3.13.base-v1 .
docker buildx build --load --progress=plain -f utils/build/docker/python/fastapi.base.Dockerfile -t datadog/system-tests:fastapi.base-v4 .
docker buildx build --load --progress=plain -f utils/build/docker/python/python3.12.base.Dockerfile -t datadog/system-tests:python3.12.base-v5 .
docker buildx build --load --progress=plain -f utils/build/docker/python/python3.12.base.Dockerfile -t datadog/system-tests:python3.12.base-v6 .
docker buildx build --load --progress=plain -f utils/build/docker/python/django-poc.base.Dockerfile -t datadog/system-tests:django-poc.base-v4 .
docker buildx build --load --progress=plain -f utils/build/docker/python/flask-poc.base.Dockerfile -t datadog/system-tests:flask-poc.base-v8 .
docker buildx build --load --progress=plain -f utils/build/docker/python/uwsgi-poc.base.Dockerfile -t datadog/system-tests:uwsgi-poc.base-v4 .

if [ "$1" = "--push" ]; then
docker push datadog/system-tests:django-py3.13.base-v0
docker push datadog/system-tests:django-py3.13.base-v1
docker push datadog/system-tests:fastapi.base-v4
docker push datadog/system-tests:python3.12.base-v5
docker push datadog/system-tests:python3.12.base-v6
docker push datadog/system-tests:django-poc.base-v4
docker push datadog/system-tests:flask-poc.base-v8
docker push datadog/system-tests:uwsgi-poc.base-v4
Expand Down
2 changes: 1 addition & 1 deletion utils/build/docker/python/django-py3.13.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM datadog/system-tests:django-py3.13.base-v0
FROM datadog/system-tests:django-py3.13.base-v1

WORKDIR /app

Expand Down
6 changes: 3 additions & 3 deletions utils/build/docker/python/django-py3.13.base.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.13.1-slim
FROM python:3.13-slim

# install bin dependancies
RUN apt-get update && apt-get install -y curl git gcc g++ make cmake
Expand All @@ -15,6 +15,6 @@ RUN pip install django pycryptodome gunicorn gevent requests boto3==1.34.141 'mo
RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y
ENV PATH="/root/.cargo/bin:$PATH"

# docker build --progress=plain -f utils/build/docker/python/django-py3.13.base.Dockerfile -t datadog/system-tests:django-py3.13.base-v0 .
# docker push datadog/system-tests:django-py3.13.base-v0
# docker build --progress=plain -f utils/build/docker/python/django-py3.13.base.Dockerfile -t datadog/system-tests:django-py3.13.base-v1 .
# docker push datadog/system-tests:django-py3.13.base-v1

2 changes: 1 addition & 1 deletion utils/build/docker/python/python3.12.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM datadog/system-tests:python3.12.base-v5
FROM datadog/system-tests:python3.12.base-v6

WORKDIR /app

Expand Down
6 changes: 3 additions & 3 deletions utils/build/docker/python/python3.12.base.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.12.1-slim
FROM python:3.12-slim

# install bin dependancies
RUN apt-get update && apt-get install -y curl git gcc g++ make cmake
Expand All @@ -15,6 +15,6 @@ RUN pip install django pycryptodome gunicorn gevent requests boto3==1.34.141 'mo
RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y
ENV PATH="/root/.cargo/bin:$PATH"

# docker build --progress=plain -f utils/build/docker/python/python3.12.base.Dockerfile -t datadog/system-tests:python3.12.base-v2 .
# docker push datadog/system-tests:python3.12.base-v2
# docker build --progress=plain -f utils/build/docker/python/python3.12.base.Dockerfile -t datadog/system-tests:python3.12.base-v6 .
# docker push datadog/system-tests:python3.12.base-v6