Skip to content
Closed
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
1 change: 1 addition & 0 deletions binaries/python-load-from-pip
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ddtrace @ git+https://github.com/DataDog/dd-trace-py.git@gnufede/pep420-test
4 changes: 2 additions & 2 deletions utils/build/build_python_base_images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@



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

if [ "$1" = "--push" ]; then
docker push datadog/system-tests:django-py3.13.base-v6
docker push datadog/system-tests:django-py3.13.base-v7
docker push datadog/system-tests:fastapi.base-v7
docker push datadog/system-tests:python3.12.base-v10
docker push datadog/system-tests:django-poc.base-v8
Expand Down
2 changes: 1 addition & 1 deletion utils/build/docker/python/django-poc.base.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM python:3.11-slim

# install bin dependancies
RUN apt-get update && apt-get install -y curl
RUN apt-get update && apt-get install -y --no-install-recommends curl gcc openssh-client git

# print versions
RUN python --version && curl --version
Expand Down
2 changes: 1 addition & 1 deletion utils/build/docker/python/django-py3.13.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM datadog/system-tests:django-py3.13.base-v6
FROM datadog/system-tests:django-py3.13.base-v7

WORKDIR /app

Expand Down
8 changes: 4 additions & 4 deletions utils/build/docker/python/django-py3.13.base.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM python:3.13-slim

# install bin dependancies
RUN apt-get update && apt-get install -y curl
RUN apt-get update && apt-get install -y --no-install-recommends curl openssh-client git

# print versions
RUN python --version && curl --version
# install python deps
ENV PIP_ROOT_USER_ACTION=ignore
RUN pip install --upgrade pip
RUN pip install django==5.2.6 pycryptodome==3.23.0 gunicorn==23.0.0 gevent==25.8.2 requests==2.32.4 boto3==1.34.141 'moto[ec2,s3,all]'==5.0.14 xmltodict==0.14.2 zope.event==5.1.1 zope.interface==7.2
RUN pip install django==5.2.7 pycryptodome==3.23.0 gunicorn==23.0.0 gevent==25.9.1 requests==2.32.4 boto3==1.40.64 'moto[ec2,s3,all]'==5.1.16 xmltodict==0.14.2 zope.event==6.0 zope.interface==8.0.1

# docker build --progress=plain -f utils/build/docker/python/django-py3.13.base.Dockerfile -t datadog/system-tests:django-py3.13.base-v6 .
# docker push datadog/system-tests:django-py3.13.base-v6
# docker build --progress=plain -f utils/build/docker/python/django-py3.13.base.Dockerfile -t datadog/system-tests:django-py3.13.base-v7 .
# docker push datadog/system-tests:django-py3.13.base-v7
2 changes: 1 addition & 1 deletion utils/build/docker/python/fastapi.base.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM python:3.11-slim

# install bin dependancies
RUN apt-get update && apt-get install -y curl
RUN apt-get update && apt-get install -y --no-install-recommends curl openssh-client git

# print versions
RUN python --version && curl --version
Expand Down
2 changes: 1 addition & 1 deletion utils/build/docker/python/flask-poc.base.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM python:3.11-slim

# install bin dependancies
RUN apt-get update && apt-get install -y curl gcc
RUN apt-get update && apt-get install -y --no-install-recommends curl gcc openssh-client git

# print versions
RUN python --version && curl --version
Expand Down
2 changes: 1 addition & 1 deletion utils/build/docker/python/python3.12.base.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM python:3.12-slim

# install bin dependancies
RUN apt-get update && apt-get install -y curl
RUN apt-get update && apt-get install -y --no-install-recommends curl gcc openssh-client git

# print versions
RUN python --version && curl --version
Expand Down
2 changes: 1 addition & 1 deletion utils/build/docker/python/uwsgi-poc.base.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM python:3.11-slim

# install bin dependancies
RUN apt-get update && apt-get install -y gcc curl
RUN apt-get update && apt-get install -y --no-install-recommends curl gcc openssh-client git

# print versions
RUN python --version && curl --version
Expand Down
Loading