Remove use of Python requirements files

DataDog · Jan 21, 2025 · 03d9530 · 03d9530
1 parent d4639d3
commit 03d9530
Show file tree

Hide file tree

Showing 24 changed files with 88 additions and 52 deletions.
diff --git a/.github/workflows/go-update.yml b/.github/workflows/go-update.yml
@@ -48,7 +48,9 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python3 -m pip install -r requirements.txt
+          DEVA_VERSION=$(grep DEVA_VERSION deva.env)
+          python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@${DEVA_VERSION}"
+          python3 -m deva -v self dep sync -f legacy-build
 
       - name: Update Go version
         run: |

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -322,7 +322,16 @@ build_circleci_runner:
     - aws ssm get-parameter --region us-east-1 --name ci.datadog-agent.docker_hub_pwd --with-decryption --query "Parameter.Value" --out text | docker login --username "$DOCKER_REGISTRY_LOGIN" --password-stdin docker.io
     # Build
     - GO_BUILD_ARGS=$(cat go.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
-    - docker build --build-arg BASE_IMAGE=$BASE_IMAGE --build-arg DD_TARGET_ARCH=$DD_TARGET_ARCH $GO_BUILD_ARGS $CUSTOM_BUILD_ARGS --tag datadog/agent-buildimages-${IMAGE}${ECR_TEST_ONLY}:$IMAGE_VERSION --file $DOCKERFILE .
+    - DEVA_BUILD_ARGS=$(cat deva.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
+    - >-
+      docker build
+      --build-arg BASE_IMAGE=$BASE_IMAGE
+      --build-arg DD_TARGET_ARCH=$DD_TARGET_ARCH
+      $GO_BUILD_ARGS
+      $DEVA_BUILD_ARGS
+      $CUSTOM_BUILD_ARGS
+      --tag datadog/agent-buildimages-${IMAGE}${ECR_TEST_ONLY}:$IMAGE_VERSION
+      --file $DOCKERFILE .
     - |
       if [ "$CI_PIPELINE_SOURCE" != "schedule" ]; then
         docker push datadog/agent-buildimages-${IMAGE}${ECR_TEST_ONLY}:$IMAGE_VERSION
@@ -404,8 +413,9 @@ push_to_datadog_agent:
       done
     # Read the Github app private token from AWS SSM
     - export GITHUB_KEY_B64=$(aws ssm get-parameter --region us-east-1 --name $SSM_GITHUB_APP_KEY --with-decryption --query "Parameter.Value" --out text)
-    - pip install -r requirements.txt
-    - pip install PyGithub -c requirements/constraints.txt
+    - export DEVA_VERSION=$(grep DEVA_VERSION deva.env)
+    - pip install "git+https://github.com/DataDog/datadog-agent-dev.git@${DEVA_VERSION}"
+    - deva -v self dep sync -f legacy-build
     - inv update-datadog-agent-buildimages --images-id "$IMAGES_ID" --ref "$REF" --branch "$BRANCH" --test-version
 
 .winbuild: &winbuild

diff --git a/.gitlab/dev_envs.yml b/.gitlab/dev_envs.yml
@@ -20,15 +20,26 @@
     - DOCKER_REGISTRY_LOGIN=$(aws ssm get-parameter --region us-east-1 --name ci.datadog-agent.docker_hub_login --with-decryption --query "Parameter.Value" --out text)
     - aws ssm get-parameter --region us-east-1 --name ci.datadog-agent.docker_hub_pwd --with-decryption --query "Parameter.Value" --out text | docker login --username "$DOCKER_REGISTRY_LOGIN" --password-stdin docker.io
     # Build
-    - docker build dev-envs/$PLATFORM --build-arg ARCH=$BASE_IMAGE_ARCH --build-arg TAG=$BASE_IMAGE_TAG
+    - DEVA_VERSION_ARG=$(grep DEVA_VERSION deva.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
+    - >-
+      docker build dev-envs/$PLATFORM
+      --build-arg ARCH=$BASE_IMAGE_ARCH
+      --build-arg TAG=$BASE_IMAGE_TAG
+      $DEVA_VERSION_ARG
 
 .publish_dev_env:
   script:
     # Docker Hub login
     - DOCKER_REGISTRY_LOGIN=$(aws ssm get-parameter --region us-east-1 --name ci.datadog-agent.docker_hub_login --with-decryption --query "Parameter.Value" --out text)
     - aws ssm get-parameter --region us-east-1 --name ci.datadog-agent.docker_hub_pwd --with-decryption --query "Parameter.Value" --out text | docker login --username "$DOCKER_REGISTRY_LOGIN" --password-stdin docker.io
     # Build and push
-    - docker build dev-envs/$PLATFORM --build-arg ARCH=$BASE_IMAGE_ARCH --build-arg TAG=$BASE_IMAGE_TAG --tag registry.ddbuild.io/ci/datadog-agent-buildimages/dev-env-$PLATFORM:$TARGET_IMAGE_ARCH
+    - DEVA_VERSION_ARG=$(grep DEVA_VERSION deva.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
+    - >-
+      docker build dev-envs/$PLATFORM
+      --build-arg ARCH=$BASE_IMAGE_ARCH
+      --build-arg TAG=$BASE_IMAGE_TAG
+      $DEVA_VERSION_ARG
+      --tag registry.ddbuild.io/ci/datadog-agent-buildimages/dev-env-$PLATFORM:$TARGET_IMAGE_ARCH
     - docker push registry.ddbuild.io/ci/datadog-agent-buildimages/dev-env-$PLATFORM:$TARGET_IMAGE_ARCH
 
 lint_dev_envs:

diff --git a/.gitlab/devcontainer.yml b/.gitlab/devcontainer.yml
@@ -17,7 +17,8 @@ lint_devcontainer:
       - PLATFORM: [amd64, arm64]
   script:
     - GO_VERSION_ARG=$(grep GO_VERSION go.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
-    - docker buildx build $GO_VERSION_ARG --no-cache --platform linux/${PLATFORM} --tag ${DOCKER_TARGET}-${PLATFORM} -f devcontainer/Dockerfile . ${PUSH}
+    - DEVA_VERSION_ARG=$(grep DEVA_VERSION deva.env | sed -e 's/^/--build-arg /' | tr '\n' ' ')
+    - docker buildx build $GO_VERSION_ARG $DEVA_VERSION_ARG --no-cache --platform linux/${PLATFORM} --tag ${DOCKER_TARGET}-${PLATFORM} -f devcontainer/Dockerfile . ${PUSH}
 
 test_devcontainer:
   extends: .build_devcontainer

diff --git a/agent-deploy/Dockerfile b/agent-deploy/Dockerfile
@@ -15,6 +15,8 @@ ARG AWSCLI_VERSION_ARG=1.34.33
 ARG RPM_S3_VERSION_ARG=0.8.0
 ARG GO_VERSION
 ARG GO_SHA256_LINUX_AMD64
+ARG DEVA_VERSION
+ARG DEVA_NO_DYNAMIC_DEPS
 ARG CI_UPLOADER_SHASUM=4e56d449e6396ae4c7356f07fc5372a28999aacb012d4343a3b8a9389123aa38
 ARG CI_UPLOADER_VERSION=2.38.1
 ARG PYTHON_VERSION=3.12.6
@@ -91,11 +93,10 @@ RUN git clone --depth=1 https://github.com/pyenv/pyenv.git ${PYENV_ROOT} && \
     pyenv global ${PYTHON_VERSION}
 
 # Python 3 deps
-COPY requirements.txt /requirements.txt
-COPY requirements /requirements
 RUN pip3 install pip \
     && pip3 install --upgrade pip \
-    && pip3 install -r requirements.txt -r requirements/agent-deploy.txt
+    && pip3 install "git+https://github.com/DataDog/datadog-agent-dev.git@${DEVA_VERSION}" \
+    && deva -v self dep sync -f legacy-build -f legacy-agent-deploy
 
 # External calls configuration
 COPY .awsconfig /root/.aws/config

diff --git a/circleci/Dockerfile b/circleci/Dockerfile
@@ -8,6 +8,8 @@ ENV DEBIAN_FRONTEND noninteractive
 
 ARG PYTHON_VERSION=3.12.6
 ARG CMAKE_VERSION=3.30.2
+ARG DEVA_VERSION
+ARG DEVA_NO_DYNAMIC_DEPS
 
 # Pre-requisites
 # Python 3 dev is required for rtloader
@@ -84,13 +86,11 @@ RUN ./setup_codecov.sh
 ENV PYENV_ROOT="/.pyenv"
 ENV PATH="$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH"
 
-COPY requirements.txt /
-COPY requirements /requirements
-
 RUN git clone --depth=1 https://github.com/pyenv/pyenv.git ${PYENV_ROOT} && \
      pyenv install ${PYTHON_VERSION} && \
      pyenv global ${PYTHON_VERSION} && \
-     pip3 install -r requirements.txt -r requirements/circleci.txt
+     pip3 install "git+https://github.com/DataDog/datadog-agent-dev.git@${DEVA_VERSION}" && \
+     deva -v self dep sync -f legacy-build -f legacy-circleci
 
 # External calls configuration
 COPY .awsconfig /root/.aws/config

diff --git a/dd-agent-testing/Dockerfile b/dd-agent-testing/Dockerfile
@@ -3,6 +3,8 @@ FROM ruby:2.7.5-bullseye
 ENV BUNDLER_VERSION=1.17.3
 ARG CI_UPLOADER_VERSION=2.38.1
 ARG CI_UPLOADER_SHA=4e56d449e6396ae4c7356f07fc5372a28999aacb012d4343a3b8a9389123aa38
+ARG DEVA_VERSION
+ARG DEVA_NO_DYNAMIC_DEPS
 ARG PYTHON_VERSION=3.12.6
 ARG VAULT_VERSION=1.17.2
 ARG VAULT_CHECKSUM=a0c0449e640c8be5dcf7b7b093d5884f6a85406dbb86bbad0ea06becad5aaab8
@@ -36,9 +38,8 @@ RUN git clone --depth=1 https://github.com/pyenv/pyenv.git ${PYENV_ROOT} && \
      pyenv global ${PYTHON_VERSION}
 
 # Python
-COPY requirements.txt /
-COPY requirements /requirements
-RUN pip3 install -r requirements.txt
+RUN pip3 install "git+https://github.com/DataDog/datadog-agent-dev.git@${DEVA_VERSION}" \
+ && deva -v self dep sync -f legacy-build
 
 # Ruby
 RUN gem install bundler --version ${BUNDLER_VERSION}

diff --git a/deb-arm/Dockerfile b/deb-arm/Dockerfile
@@ -106,7 +106,7 @@ RUN if [ "$DD_TARGET_ARCH" = "armhf" ] ; then \
 ENV PATH "~/.cargo/bin:${PATH}"
 
 # CONDA
-COPY python-packages-versions.txt setup_python.sh requirements.txt /
+COPY python-packages-versions.txt setup_python.sh /
 COPY requirements /requirements
 ENV DEVA_VERSION=$DEVA_VERSION
 ENV DEVA_NO_DYNAMIC_DEPS=$DEVA_NO_DYNAMIC_DEPS

diff --git a/deb-x64/Dockerfile b/deb-x64/Dockerfile
@@ -145,7 +145,7 @@ RUN curl -fsSL https://github.com/DataDog/datadog-ci/releases/download/v${CI_UPL
     chmod +x /usr/local/bin/datadog-ci
 
 # CONDA
-COPY python-packages-versions.txt setup_python.sh requirements.txt /
+COPY python-packages-versions.txt setup_python.sh /
 COPY requirements /requirements
 ENV DEVA_VERSION=$DEVA_VERSION
 ENV DEVA_NO_DYNAMIC_DEPS=$DEVA_NO_DYNAMIC_DEPS

diff --git a/dev-envs/linux/Dockerfile b/dev-envs/linux/Dockerfile
@@ -2,6 +2,8 @@ ARG ARCH=arm64
 ARG TAG=latest
 FROM datadog/agent-buildimages-deb_${ARCH}:${TAG}
 
+ARG DEVA_VERSION
+
 # Set up scripts
 COPY scripts /root/.scripts
 COPY scripts.sh /setup/scripts.sh
@@ -39,9 +41,13 @@ RUN /setup/env-vars.sh
 COPY utils.sh /setup/utils.sh
 RUN /setup/utils.sh
 
+# Set up Git
+COPY git.sh /setup/git.sh
+RUN /setup/git.sh
+
 # Set up Python
 COPY python.sh /setup/python.sh
-RUN /setup/python.sh
+RUN DEVA_VERSION=${DEVA_VERSION} /setup/python.sh
 
 # Set up fonts
 COPY fonts.sh /setup/fonts.sh
@@ -51,19 +57,16 @@ RUN /setup/fonts.sh
 COPY starship.sh /setup/starship.sh
 RUN /setup/starship.sh
 
-# Set up OpenSSH server
-COPY ssh.sh /setup/ssh.sh
-RUN /setup/ssh.sh
-
-# Set up Git
-COPY git.sh /setup/git.sh
-RUN /setup/git.sh
-
 # Set up Visual Studio Code
 COPY default-vscode-extensions.txt /setup/default-vscode-extensions.txt
 COPY vscode.sh /setup/vscode.sh
 RUN /setup/vscode.sh
 
+# Set up OpenSSH server
+# IMPORTANT: make sure this comes last so Git operations don't use SSH during building
+COPY ssh.sh /setup/ssh.sh
+RUN /setup/ssh.sh
+
 # Remove setup files
 # hadolint ignore=DL3059
 RUN rm -rf /setup

diff --git a/dev-envs/linux/git.sh b/dev-envs/linux/git.sh
@@ -4,6 +4,10 @@ set -euxo pipefail
 
 git_dir="${HOME}/git"
 
+# Temporarily required for the ARM image, see:
+# https://confluence.atlassian.com/bitbucketserverkb/bitbucket-server-repository-import-fails-with-error-remote-https-is-not-a-git-command-1103438202.html
+apt-get update && apt-get install -y libcurl4-openssl-dev
+
 # https://git-scm.com/book/en/v2/Getting-Started-Installing-Git#_installing_from_source
 install-from-source \
     --version "2.37.3" \
@@ -17,12 +21,6 @@ install-from-source \
 # install at a different path so as to not conflict with the build process
 path-prepend "${git_dir}/bin"
 
-# Force SSH for Go dependencies
-cat <<'EOF' >> "${HOME}/.gitconfig"
-[url "ssh://[email protected]/"]
-insteadOf = https://github.com/
-EOF
-
 # Set up signing:
 # https://github.blog/open-source/git/highlights-from-git-2-34/#tidbits
 git config --global commit.gpgsign true

diff --git a/dev-envs/linux/python.sh b/dev-envs/linux/python.sh
@@ -30,6 +30,7 @@ rm cpython.tar.gz
 
 /tools/python/bin/python -m venv "${HOME}/.venv"
 
-"${HOME}/.venv/bin/pip" install -r https://raw.githubusercontent.com/DataDog/datadog-agent/main/requirements.txt
+"${HOME}/.venv/bin/pip" install "git+https://github.com/DataDog/datadog-agent-dev.git@${DEVA_VERSION}"
+"${HOME}/.venv/bin/deva" -v self dep sync -f legacy-tasks
 
 path-prepend "${HOME}/.venv/bin"
diff --git a/dev-envs/linux/ssh.sh b/dev-envs/linux/ssh.sh
@@ -28,3 +28,9 @@ github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okW
 github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
 github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=
 EOF
+
+# Force SSH for Go dependencies
+cat <<'EOF' >> "${HOME}/.gitconfig"
+[url "ssh://[email protected]/"]
+insteadOf = https://github.com/
+EOF
diff --git a/devcontainer/Dockerfile b/devcontainer/Dockerfile
@@ -2,6 +2,7 @@ FROM ubuntu:22.04
 
 ARG TARGETARCH
 ARG GO_VERSION
+ARG DEVA_VERSION
 ARG PYTHON_VERSION=3.12
 ENV DEBIAN_FRONTEND=noninteractive
 ENV DATADOG_AGENT_EMBEDDED_PATH=/opt/datadog-agent/embedded
@@ -30,7 +31,8 @@ RUN useradd -g 20 -u 503 -m datadog -s /bin/bash -G sudo,root && \
     echo 'datadog ALL=(ALL:ALL) NOPASSWD:ALL' > /etc/sudoers.d/datadog && \
     # Pin pyasn1 to 0.6.0 until the maintainers release a wheel for 0.6.1 version
     pip3 install --no-cache-dir pyasn1==0.6.0 && \
-    pip3 install --no-cache-dir -r https://raw.githubusercontent.com/DataDog/datadog-agent/master/requirements.txt && \
+    pip3 install --no-cache-dir "git+https://github.com/DataDog/datadog-agent-dev.git@${DEVA_VERSION}" && \
+    deva -v self dep sync -f legacy-tasks && \
     # Correct some permissions
     mkdir -p $DATADOG_AGENT_EMBEDDED_PATH && chown -R 503:20 $DATADOG_AGENT_EMBEDDED_PATH && \
     # Omnibus setup

diff --git a/docker-arm64/Dockerfile b/docker-arm64/Dockerfile
@@ -1,6 +1,8 @@
 FROM 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:20.10
 
 ARG PYTHON_VERSION=3.12.6
+ARG DEVA_VERSION
+ARG DEVA_NO_DYNAMIC_DEPS
 ARG GO_VERSION
 ARG GO_SHA256_LINUX_ARM64
 ARG CI_UPLOADER_VERSION=2.38.1
@@ -38,10 +40,8 @@ RUN git clone --depth=1 https://github.com/pyenv/pyenv.git ${PYENV_ROOT} && \
      pyenv install ${PYTHON_VERSION} && \
      pyenv global ${PYTHON_VERSION}
 
-COPY requirements.txt /
-COPY requirements /requirements
-
-RUN pip install -r requirements.txt
+RUN pip install "git+https://github.com/DataDog/datadog-agent-dev.git@${DEVA_VERSION}" \
+ && deva -v self dep sync -f legacy-build
 
 # Install Go
 RUN curl -sL -o /tmp/golang.tar.gz https://go.dev/dl/go$GO_VERSION.linux-arm64.tar.gz \

diff --git a/docker-x64/Dockerfile b/docker-x64/Dockerfile
@@ -1,6 +1,8 @@
 FROM 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:20.10
 
 ARG PYTHON_VERSION=3.12.6
+ARG DEVA_VERSION
+ARG DEVA_NO_DYNAMIC_DEPS
 ARG GO_VERSION
 ARG GO_SHA256_LINUX_AMD64
 ARG CI_UPLOADER_VERSION=2.38.1
@@ -38,10 +40,8 @@ RUN git clone --depth=1 https://github.com/pyenv/pyenv.git ${PYENV_ROOT} && \
      pyenv install ${PYTHON_VERSION} && \
      pyenv global ${PYTHON_VERSION}
 
-COPY requirements.txt /
-COPY requirements /requirements
-
-RUN pip install -r requirements.txt
+RUN pip install "git+https://github.com/DataDog/datadog-agent-dev.git@${DEVA_VERSION}" \
+ && deva -v self dep sync -f legacy-build
 
 # Install Go
 RUN curl -sL -o /tmp/golang.tar.gz https://go.dev/dl/go$GO_VERSION.linux-amd64.tar.gz \

diff --git a/linux-glibc-2.17-x64/Dockerfile b/linux-glibc-2.17-x64/Dockerfile
@@ -75,7 +75,7 @@ RUN mkdir -p /opt/mqm \
     && rm -rf /tmp/mq_client.tar.gz
 
 # CONDA
-COPY python-packages-versions.txt setup_python.sh requirements.txt /
+COPY python-packages-versions.txt setup_python.sh /
 COPY requirements /requirements
 ENV DEVA_VERSION=$DEVA_VERSION
 ENV DEVA_NO_DYNAMIC_DEPS=$DEVA_NO_DYNAMIC_DEPS

diff --git a/linux-glibc-2.23-arm64/Dockerfile b/linux-glibc-2.23-arm64/Dockerfile
@@ -65,7 +65,7 @@ RUN cd /build && \
 
 
 # CONDA
-COPY python-packages-versions.txt setup_python.sh requirements.txt /
+COPY python-packages-versions.txt setup_python.sh /
 COPY requirements /requirements
 ENV DEVA_VERSION=$DEVA_VERSION
 ENV DEVA_NO_DYNAMIC_DEPS=$DEVA_NO_DYNAMIC_DEPS

diff --git a/rpm-arm64/Dockerfile b/rpm-arm64/Dockerfile
@@ -94,7 +94,7 @@ RUN curl -fsSL https://github.com/DataDog/datadog-ci/releases/download/v${CI_UPL
     && chmod +x /usr/local/bin/datadog-ci
 
 # CONDA
-COPY python-packages-versions.txt setup_python.sh requirements.txt /
+COPY python-packages-versions.txt setup_python.sh /
 COPY requirements /requirements
 ENV DEVA_VERSION=$DEVA_VERSION
 ENV DEVA_NO_DYNAMIC_DEPS=$DEVA_NO_DYNAMIC_DEPS

diff --git a/rpm-armhf/Dockerfile b/rpm-armhf/Dockerfile
@@ -127,7 +127,7 @@ RUN curl -sSL -o rustup-init https://static.rust-lang.org/rustup/archive/${RUSTU
 ENV PATH "~/.cargo/bin:${PATH}"
 
 # CONDA
-COPY python-packages-versions.txt setup_python.sh requirements.txt /
+COPY python-packages-versions.txt setup_python.sh /
 COPY requirements /requirements
 ENV DEVA_VERSION=$DEVA_VERSION
 ENV DEVA_NO_DYNAMIC_DEPS=$DEVA_NO_DYNAMIC_DEPS

diff --git a/rpm-x64/Dockerfile b/rpm-x64/Dockerfile
@@ -127,7 +127,7 @@ RUN git config --global user.email "[email protected]"
 RUN git config --global user.name "Bits"
 
 # CONDA
-COPY python-packages-versions.txt setup_python.sh requirements.txt /
+COPY python-packages-versions.txt setup_python.sh /
 COPY requirements /requirements
 ENV DEVA_VERSION=$DEVA_VERSION
 ENV DEVA_NO_DYNAMIC_DEPS=$DEVA_NO_DYNAMIC_DEPS

diff --git a/system-probe_arm64/Dockerfile b/system-probe_arm64/Dockerfile
@@ -55,7 +55,7 @@ ENV CONDA_PATH /root/miniforge3
 ENV DD_TARGET_ARCH $DD_TARGET_ARCH
 
 # CONDA
-COPY python-packages-versions.txt setup_python.sh requirements.txt /
+COPY python-packages-versions.txt setup_python.sh /
 COPY requirements /requirements
 ENV DEVA_VERSION=$DEVA_VERSION
 ENV DEVA_NO_DYNAMIC_DEPS=$DEVA_NO_DYNAMIC_DEPS

diff --git a/system-probe_x64/Dockerfile b/system-probe_x64/Dockerfile
@@ -60,7 +60,7 @@ ENV CONDA_PATH /root/miniforge3
 ENV DD_TARGET_ARCH $DD_TARGET_ARCH
 
 # CONDA
-COPY python-packages-versions.txt setup_python.sh requirements.txt /
+COPY python-packages-versions.txt setup_python.sh /
 COPY requirements /requirements
 ENV DEVA_VERSION=$DEVA_VERSION
 ENV DEVA_NO_DYNAMIC_DEPS=$DEVA_NO_DYNAMIC_DEPS

diff --git a/windows/Dockerfile b/windows/Dockerfile
@@ -65,7 +65,7 @@ COPY ./windows/helpers/*.ps1 c:/scripts/helpers/
 COPY go.env c:/
 COPY deva.env c:/
 
-COPY python-packages-versions.txt requirements.txt /
+COPY python-packages-versions.txt /
 COPY requirements /requirements
 COPY ./windows/set_cpython_compiler.cmd set_cpython_compiler.cmd