Skip to content

Commit

Permalink
OTEL Logs collector Dockerfile 0.105.0 -> 0.107.0 (#330)
Browse files Browse the repository at this point in the history
* [otel] switch both images to fixed releases

* [otel] fix syntax

* add missing library

* chore(codeowners): add dockerfile owners

---------

Co-authored-by: Richard Tief <[email protected]>
  • Loading branch information
Kuckkuck and richardtief authored Aug 20, 2024
1 parent e06397d commit b2c9d44
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 3 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
/openbao/ @cloudoperators/greenhouse-src @dimtas
5 changes: 3 additions & 2 deletions Dockerfile.otel-collector
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit b2c9d44

Please sign in to comment.