From 505178fefe84ae9eb73e2fe0f2934321921a30dd Mon Sep 17 00:00:00 2001 From: Charles de Beauchesne Date: Tue, 20 May 2025 15:56:38 +0200 Subject: [PATCH 1/2] do not require ca-certificate for agent image --- utils/build/docker/agent.Dockerfile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/utils/build/docker/agent.Dockerfile b/utils/build/docker/agent.Dockerfile index b39208a3668..4c26efff1d0 100644 --- a/utils/build/docker/agent.Dockerfile +++ b/utils/build/docker/agent.Dockerfile @@ -2,11 +2,6 @@ ARG AGENT_IMAGE=datadog/agent:latest FROM $AGENT_IMAGE -RUN set -eux;\ - apt-get update;\ - apt-get --no-install-recommends -y install ca-certificates --option=Dpkg::Options::=--force-confdef;\ - rm -rf /var/lib/apt/lists/*; - # Datadog agent conf RUN echo '\ log_level: DEBUG\n\ @@ -40,10 +35,7 @@ otlp_config:\n\ # Proxy conf COPY utils/scripts/install_mitm_certificate.sh . -RUN set -eux;\ - mkdir -p /usr/local/share/ca-certificates;\ - ./install_mitm_certificate.sh /usr/local/share/ca-certificates/mitm.crt;\ - update-ca-certificates; +RUN ./install_mitm_certificate.sh /etc/ssl/certs/ca-certificates.crt; # Smoke test RUN /opt/datadog-agent/bin/agent/agent version From 56b4f1abe243b956b72269e1505d7de36707fdf0 Mon Sep 17 00:00:00 2001 From: Charles de Beauchesne Date: Wed, 21 May 2025 09:55:23 +0200 Subject: [PATCH 2/2] Removes desired_execution_time --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 212a00d3cf1..73991b8eff0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -91,7 +91,7 @@ jobs: build_lib_injection_app_images: ${{ contains(github.event.pull_request.labels.*.name, 'build-lib-injection-app-images') }} parametric_job_count: ${{ matrix.version == 'dev' && 2 || 1 }} # test both use cases skip_empty_scenarios: true - desired_execution_time: 3600 # 60 minutes + # desired_execution_time: 3600 # 60 minutes _system_tests_dev_mode: ${{ matrix.version == 'dev' }} _system_tests_library_target_branch: ${{ needs.impacted_libraries.outputs.target-branch }}