Skip to content

Commit

Permalink
Remove use of Python requirements files
Browse files Browse the repository at this point in the history
  • Loading branch information
ofek committed Jan 17, 2025
1 parent c6b0e64 commit 6a341fe
Show file tree
Hide file tree
Showing 27 changed files with 90 additions and 50 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/go-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
16 changes: 13 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,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
Expand Down Expand Up @@ -405,8 +414,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
Expand Down
15 changes: 13 additions & 2 deletions .gitlab/dev_envs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion .gitlab/devcontainer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions agent-deploy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -79,11 +81,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
Expand Down
8 changes: 4 additions & 4 deletions circleci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions dd-agent-testing/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion deb-arm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deb-x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,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
Expand Down
12 changes: 7 additions & 5 deletions dev-envs/linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -55,10 +61,6 @@ RUN /setup/starship.sh
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
Expand Down
6 changes: 0 additions & 6 deletions dev-envs/linux/git.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,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
Expand Down
5 changes: 4 additions & 1 deletion dev-envs/linux/python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ 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
gix clone --ref "${DEVA_VERSION}" https://github.com/DataDog/datadog-agent-dev /tmp/datadog-agent-dev
"${HOME}/.venv/bin/pip" install /tmp/datadog-agent-dev
"${HOME}/.venv/bin/deva" -v self dep sync -f legacy-tasks
rm -rf /tmp/datadog-agent-dev

path-prepend "${HOME}/.venv/bin"
6 changes: 6 additions & 0 deletions dev-envs/linux/ssh.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 7 additions & 0 deletions dev-envs/linux/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,13 @@ install-binary \
--url "https://github.com/sharkdp/bat/releases/download/v{{version}}/bat-v{{version}}-${rtarget}.tar.gz" \
--name "bat"

install-binary \
--version "0.40.0" \
--digest "2bd4e5d8f2fbf4ed4d3e24074680d6ea4cff66585d324387a739ea8182b3cfc8" \
--digest "6c1ac00996933298534a23b773fda077145afcf6daaea33a7d54e24adf67b0a4" \
--url "https://github.com/GitoxideLabs/gitoxide/releases/download/v{{version}}/gitoxide-max-pure-v{{version}}-${rtarget}.tar.gz" \
--name "gix"

AMBR_VERSION="0.6.0"
if [[ $arch == "x86_64" ]]; then
install-binary \
Expand Down
4 changes: 3 additions & 1 deletion devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions docker-arm64/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 \
Expand Down
8 changes: 4 additions & 4 deletions docker-x64/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion linux-glibc-2.17-x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion linux-glibc-2.23-arm64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rpm-arm64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rpm-armhf/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rpm-x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion system-probe_arm64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion system-probe_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion windows/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions windows/helpers/phase2/install_embedded_pythons.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,3 @@ $py3getpipsha256 = "6fb7b781206356f45ad79efbb19322caa6c2a5ad39092d0d44d0fec94117
Get-RemoteFile -LocalFile "get-pip.py" -RemoteFile $py3getpip -VerifyHash $py3getpipsha256
& "$py3Target\python" get-pip.py pip==${Env:DD_PIP_VERSION_PY3}
If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
& "$py3Target\python" -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@${Env:DEVA_VERSION}"
If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
Loading

0 comments on commit 6a341fe

Please sign in to comment.