Skip to content

do not require ca-certificate for agent image #4676 #4677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cbeauchesne merged 5 commits into from
May 21, 2025
Merged

do not require ca-certificate for agent image #4676 #4677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
505178f
do not require ca-certificate for agent image
cbeauchesne May 20, 2025
5ad694c
Merge branch 'main' into cbeauchesne/no-apt-call-on-agent
cbeauchesne May 20, 2025
56b4f1a
Removes desired_execution_time
cbeauchesne May 21, 2025
3d8ad38
Merge branch 'cbeauchesne/no-apt-call-on-agent' of github.com:DataDog…
cbeauchesne May 21, 2025
5130432
Merge branch 'main' into cbeauchesne/no-apt-call-on-agent
cbeauchesne May 21, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
10 changes: 1 addition & 9 deletions utils/build/docker/agent.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\
Expand Down Expand Up @@ -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