From b2c9d4471cd47512e3b3fb2bf942908f465c548e Mon Sep 17 00:00:00 2001 From: Olaf Heydorn Date: Tue, 20 Aug 2024 15:03:27 +0200 Subject: [PATCH] OTEL Logs collector Dockerfile 0.105.0 -> 0.107.0 (#330) * [otel] switch both images to fixed releases * [otel] fix syntax * add missing library * chore(codeowners): add dockerfile owners --------- Co-authored-by: Richard Tief --- .github/CODEOWNERS | 4 +++- Dockerfile.otel-collector | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 488ea189..9a61b769 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -10,6 +10,8 @@ Makefile @cloudoperators/greenhouse-backend ct.yaml @cloudoperators/greenhouse-backend +Dockerfile.otel-collector @cloudoperators/greenhouse-observability +Dockerfile.integration-tests @cloudoperators/greenhouse-core @cloudoperators/greenhouse-observability /docs/ @cloudoperators/greenhouse-core /hack/ @cloudoperators/greenhouse-backend @@ -38,4 +40,4 @@ ui/ @cloudoperators/greenhouse-frontend /heureka-scanner-k8s-assets/ @cloudoperators/greenhouse-src @dimtas /heureka-scanner-keppel/ @cloudoperators/greenhouse-src @dimtas /heureka-scanner-nvd/ @cloudoperators/greenhouse-src @dimtas -/openbao/ @cloudoperators/greenhouse-src @dimtas \ No newline at end of file +/openbao/ @cloudoperators/greenhouse-src @dimtas diff --git a/Dockerfile.otel-collector b/Dockerfile.otel-collector index 5e20038b..3fb14903 100644 --- a/Dockerfile.otel-collector +++ b/Dockerfile.otel-collector @@ -1,9 +1,9 @@ -FROM --platform=${BUILDPLATFORM:-linux/amd64} debian:latest as journal +FROM --platform=${BUILDPLATFORM:-linux/amd64} debian:12.6 AS journal RUN apt update \ && apt upgrade -y \ && apt autoremove -y \ && apt install -y systemd libssl-dev -FROM --platform=${BUILDPLATFORM:-linux/amd64} ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest +FROM --platform=${BUILDPLATFORM:-linux/amd64} ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.107.0 LABEL source_repository="https://github.com/greenhouse-extensions" COPY --from=journal /lib/x86_64-linux-gnu/libc.so.6 /lib/x86_64-linux-gnu/libc.so.6 COPY --from=journal /lib64/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2 @@ -39,6 +39,7 @@ COPY --from=journal /lib/x86_64-linux-gnu/libzstd.so.1 /lib/x86_64-linux-gnu/lib COPY --from=journal /lib/x86_64-linux-gnu/libcrypto.so.3 /lib/x86_64-linux-gnu/libcrypto.so.3 COPY --from=journal /lib/x86_64-linux-gnu/libcrypt.so.1 /lib/x86_64-linux-gnu/libcrypt.so.1 COPY --from=journal /lib/x86_64-linux-gnu/libcap-ng.so.0 /lib/x86_64-linux-gnu/libcap-ng.so.0 +COPY --from=journal /usr/lib/x86_64-linux-gnu/libcap-ng.so.0.0.0 /lib/x86_64-linux-gnu/libcap-ng.so.0.0.0 COPY --from=journal /usr/bin/journalctl /usr/bin/journalctl ARG USER_UID=0