From 45b31ad340d2904a6c956ba4daae11ba4578631d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 02:20:12 +0000 Subject: [PATCH 1/7] Update alpine Docker tag to v3.19 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 047bf86..717e3e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18 as systemd-builder +FROM alpine:3.19 as systemd-builder RUN apk add --no-cache \ autoconf \ @@ -192,7 +192,7 @@ RUN rm -rf \ # =========================== -FROM alpine:3.18 AS datadog-agent +FROM alpine:3.19 AS datadog-agent RUN apk add \ aws-cli \ From 8132c8535494599a8e2af5f41326270739dd1c36 Mon Sep 17 00:00:00 2001 From: Atsushi Watanabe Date: Tue, 9 Jan 2024 11:31:57 +0900 Subject: [PATCH 2/7] Update golang alpine version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 717e3e3..c697c81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,7 +50,7 @@ RUN strip -s /usr/local/lib/libsystemd.so.${SYSTEMD_LIB_VERSION} # =========================== -FROM golang:1.21-alpine3.17 AS agent-builder +FROM golang:1.21-alpine3.19 AS agent-builder RUN apk add --no-cache \ aws-cli \ From 1da790eadbcea449cb99e0b0f384ded3a1f49fd6 Mon Sep 17 00:00:00 2001 From: Atsushi Watanabe Date: Tue, 9 Jan 2024 11:57:45 +0900 Subject: [PATCH 3/7] Update systemd version to v254.4 --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c697c81..180e3e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,9 +24,9 @@ RUN apk add --no-cache \ xz-dev \ zstd-dev -ARG SYSTEMD_VERSION=v250.5 -ARG SYSTEMD_LIB_VERSION=0.33.0 -ARG OPENEMBEDDED_CORE_SHA=20a7ab9ff6ed777c6617a338d049ebe03fcc588c +ARG SYSTEMD_VERSION=v254.4 +ARG SYSTEMD_LIB_VERSION=0.37.0 +ARG OPENEMBEDDED_CORE_SHA=8063bcb2d4fcfeded5edac3b0895151e8dc8bf0f ENV CFLAGS=-Os WORKDIR /work/systemd From dc9bdc790b5d46bbd468d2d11903422f13838c18 Mon Sep 17 00:00:00 2001 From: Atsushi Watanabe Date: Tue, 9 Jan 2024 13:48:35 +0900 Subject: [PATCH 4/7] Install more python deps as apk --- Dockerfile | 46 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 180e3e7..cd83f12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -67,12 +67,17 @@ RUN apk add --no-cache \ patch \ py3-boto3 \ py3-botocore \ + py3-docker-py \ py3-dulwich \ + py3-isort \ py3-packaging \ py3-pip \ + py3-prompt_toolkit \ py3-requests \ + py3-ruamel.yaml \ py3-semver \ py3-toml \ + py3-urllib3=~1 \ py3-wheel \ py3-yaml \ python3-dev @@ -86,27 +91,40 @@ RUN git clone --depth=1 https://github.com/DataDog/datadog-agent.git /build/data WORKDIR /build/datadog-agent -ARG DATADOG_AGENT_BUILDIMAGES_VERSION=a916f5e0836ec4a24f6b65b7c449e5126d26b913 +ARG DATADOG_AGENT_BUILDIMAGES_VERSION=b45ddae424d22a220e855533be5b197edfa1451d + +ARG CI_ONLY_DEPS=" \ + codeowners \ + docker-squash \ + reno \ +" +ARG SYSTEM_PYTHON_DEPS=" \ + PyYAML \ + awscli \ + docker \ + dulwich \ + packaging \ + boto3 \ + botocore \ + isort \ + requests \ + ruamel.yaml \ + semver \ + toml \ + urllib3 \ + wheel \ +" + RUN mkdir -p buildimages \ && git -C buildimages init \ && git -C buildimages remote add origin https://github.com/DataDog/datadog-agent-buildimages.git \ && git -C buildimages fetch --depth 1 origin ${DATADOG_AGENT_BUILDIMAGES_VERSION} \ && git -C buildimages checkout FETCH_HEAD \ - && for d in \ - PyYAML \ - awscli \ - dulwich \ - packaging \ - boto3 \ - botocore \ - requests \ - semver \ - toml \ - ; do \ - sed "/^$d=/d" -i $(find buildimages -name requirements.txt); \ + && for d in ${CI_ONLY_DEPS} ${SYSTEM_PYTHON_DEPS}; do \ + sed "/^$d\(=\|$\)/d" -i requirements.txt buildimages/requirements.txt buildimages/requirements/constraints.txt; \ done \ && sed 's|-r .*/DataDog/datadog-agent-buildimages/main/requirements.txt|-r buildimages/requirements.txt|' -i requirements.txt \ - && python3 -m pip install -r requirements.txt + && python3 -m pip install -r requirements.txt --break-system-packages RUN invoke deps ENV CGO_CFLAGS="-Os -I/build/datadog-agent/dev/include" \ From e065714468d1cace3e644a8659532844a9f45b6c Mon Sep 17 00:00:00 2001 From: Atsushi Watanabe Date: Tue, 9 Jan 2024 14:26:16 +0900 Subject: [PATCH 5/7] Fix building integrations-core --- Dockerfile | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index cd83f12..129b601 100644 --- a/Dockerfile +++ b/Dockerfile @@ -99,14 +99,14 @@ ARG CI_ONLY_DEPS=" \ reno \ " ARG SYSTEM_PYTHON_DEPS=" \ - PyYAML \ awscli \ - docker \ - dulwich \ - packaging \ boto3 \ botocore \ + docker \ + dulwich \ isort \ + packaging \ + pyyaml \ requests \ ruamel.yaml \ semver \ @@ -121,7 +121,7 @@ RUN mkdir -p buildimages \ && git -C buildimages fetch --depth 1 origin ${DATADOG_AGENT_BUILDIMAGES_VERSION} \ && git -C buildimages checkout FETCH_HEAD \ && for d in ${CI_ONLY_DEPS} ${SYSTEM_PYTHON_DEPS}; do \ - sed "/^$d\(=\|$\)/d" -i requirements.txt buildimages/requirements.txt buildimages/requirements/constraints.txt; \ + sed "/^$d\(=\|$\)/di" -i requirements.txt buildimages/requirements.txt buildimages/requirements/constraints.txt; \ done \ && sed 's|-r .*/DataDog/datadog-agent-buildimages/main/requirements.txt|-r buildimages/requirements.txt|' -i requirements.txt \ && python3 -m pip install -r requirements.txt --break-system-packages @@ -224,6 +224,8 @@ RUN apk add \ lz4-libs \ openssl-dev \ py3-cryptography \ + py3-jellyfish \ + py3-python-gssapi \ py3-packaging \ py3-pip \ py3-prometheus-client \ @@ -232,8 +234,12 @@ RUN apk add \ py3-pysocks \ py3-requests \ py3-requests-toolbelt \ + py3-rpds-py \ + py3-simplejson \ py3-six \ py3-wheel \ + py3-wrapt \ + py3-yaml \ python3 \ xz-libs \ zstd-libs \ @@ -316,16 +322,23 @@ RUN apk add --virtual .build-deps \ && for d in \ botocore \ cryptography \ + gssapi \ + jellyfish \ prometheus-client \ protobuf \ pysocks \ + pyyaml \ requests \ requests_toolbelt \ + simplejson \ six \ + wheel \ + wrapt \ ; do \ - sed "/\"$d=/d" -i datadog_checks_base/pyproject.toml; \ + sed "/\"$d=/di" -i datadog_checks_base/pyproject.toml; \ done \ && python3 -m pip install \ + --break-system-packages \ "./datadog_checks_base[deps, http]" \ $(echo ${INTEGRATIONS_CORE} | xargs -n1 echo | sed 's|^|./|') \ && apk del --force-broken-world .build-deps \ From b8f33b32a89b2be816fc4242faefd02e27a92caf Mon Sep 17 00:00:00 2001 From: Atsushi Watanabe Date: Tue, 9 Jan 2024 14:38:35 +0900 Subject: [PATCH 6/7] Uninstall krb5-dev --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 85d9a6f..cb72cc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -315,7 +315,6 @@ RUN apk add --virtual .build-deps \ g++ \ gcc \ git \ - krb5-dev \ linux-headers \ musl-dev \ python3-dev \ From 699595bdc57fc4987023a6383508ea653f7fd3c1 Mon Sep 17 00:00:00 2001 From: Atsushi Watanabe Date: Fri, 12 Jan 2024 14:07:17 +0900 Subject: [PATCH 7/7] Set --break-system-packages to integration builder build script --- integrations-builder.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integrations-builder.Dockerfile b/integrations-builder.Dockerfile index 38a6587..271daf9 100644 --- a/integrations-builder.Dockerfile +++ b/integrations-builder.Dockerfile @@ -34,7 +34,7 @@ RUN git clone --depth=1 https://github.com/DataDog/integrations-core.git /tmp/in && git checkout refs/tags/${DATADOG_INTEGRATIONS_CORE_VERSION} \ && version() { apk info $1 2> /dev/null | sed -n 's/\S\+-\([0-9\.]\+\)-r[0-9]\+ description:/\1/p'; } \ && . ${HOME}/.cargo/env \ - && python3 -m pip install \ + && python3 -m pip install --break-system-packages \ aiohttp==$(version py3-aiohttp) \ bcrypt==$(version py3-bcrypt) \ cryptography==$(version py3-cryptography) \