diff --git a/binaries/python-load-from-pip b/binaries/python-load-from-pip new file mode 100644 index 00000000000..8dd131f0ef7 --- /dev/null +++ b/binaries/python-load-from-pip @@ -0,0 +1 @@ +ddtrace @ git+https://github.com/DataDog/dd-trace-py.git@gnufede/pep420-test diff --git a/utils/build/build_python_base_images.sh b/utils/build/build_python_base_images.sh index e4b5a077c18..82b9b6aebea 100755 --- a/utils/build/build_python_base_images.sh +++ b/utils/build/build_python_base_images.sh @@ -4,7 +4,7 @@ -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 . @@ -12,7 +12,7 @@ docker buildx build --load --progress=plain -f utils/build/docker/python/flask-p 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 diff --git a/utils/build/docker/python/django-poc.base.Dockerfile b/utils/build/docker/python/django-poc.base.Dockerfile index 467e40b3691..53f1cd9bb88 100644 --- a/utils/build/docker/python/django-poc.base.Dockerfile +++ b/utils/build/docker/python/django-poc.base.Dockerfile @@ -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 diff --git a/utils/build/docker/python/django-py3.13.Dockerfile b/utils/build/docker/python/django-py3.13.Dockerfile index fe0be61e2fb..1baf55db83a 100644 --- a/utils/build/docker/python/django-py3.13.Dockerfile +++ b/utils/build/docker/python/django-py3.13.Dockerfile @@ -1,4 +1,4 @@ -FROM datadog/system-tests:django-py3.13.base-v6 +FROM datadog/system-tests:django-py3.13.base-v7 WORKDIR /app diff --git a/utils/build/docker/python/django-py3.13.base.Dockerfile b/utils/build/docker/python/django-py3.13.base.Dockerfile index 85ca8864088..cf38434fe4d 100644 --- a/utils/build/docker/python/django-py3.13.base.Dockerfile +++ b/utils/build/docker/python/django-py3.13.base.Dockerfile @@ -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 diff --git a/utils/build/docker/python/fastapi.base.Dockerfile b/utils/build/docker/python/fastapi.base.Dockerfile index 3b0d795f156..46913a71294 100644 --- a/utils/build/docker/python/fastapi.base.Dockerfile +++ b/utils/build/docker/python/fastapi.base.Dockerfile @@ -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 diff --git a/utils/build/docker/python/flask-poc.base.Dockerfile b/utils/build/docker/python/flask-poc.base.Dockerfile index 525505d73d3..3a728d43e42 100644 --- a/utils/build/docker/python/flask-poc.base.Dockerfile +++ b/utils/build/docker/python/flask-poc.base.Dockerfile @@ -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 diff --git a/utils/build/docker/python/python3.12.base.Dockerfile b/utils/build/docker/python/python3.12.base.Dockerfile index 06c68fb7851..59b00eeab51 100644 --- a/utils/build/docker/python/python3.12.base.Dockerfile +++ b/utils/build/docker/python/python3.12.base.Dockerfile @@ -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 diff --git a/utils/build/docker/python/uwsgi-poc.base.Dockerfile b/utils/build/docker/python/uwsgi-poc.base.Dockerfile index fb329c22442..fc5df16f4a4 100644 --- a/utils/build/docker/python/uwsgi-poc.base.Dockerfile +++ b/utils/build/docker/python/uwsgi-poc.base.Dockerfile @@ -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