Skip to content

Commit

Permalink
Merge pull request #218 from samiura/revert-openshit-related-changes
Browse files Browse the repository at this point in the history
Reverted Openshift related kernel collector dockerfile changes
  • Loading branch information
samiura authored Jun 27, 2023
2 parents 9dc128a + 3dcbe3a commit 0f1c7d0
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions collector/kernel/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

FROM quay.io/splunko11ytest/network-explorer-debug/rhcos:latest as copier
FROM bitnami/minideb:bullseye


LABEL org.label-schema.name="opentelemetry-ebpf-kernel-collector"
LABEL org.label-schema.description="OpenTelemetry eBPF kernel information collector"
LABEL org.label-schema.vcs-url="https://github.com/open-telemetry/opentelemetry-ebpf"
Expand All @@ -18,7 +16,7 @@ ENV EBPF_NET_INSTALL_DIR=/srv
ENV EBPF_NET_HOST_DIR=/hostfs
ENV EBPF_NET_DATA_DIR=/var/run/ebpf_net

ENTRYPOINT [ "/srv/entrypoint.sh"]
ENTRYPOINT [ "/srv/entrypoint.sh" ]

# required by kernel_headers.sh script
RUN install_packages coreutils curl sed tar dnf rpm
Expand All @@ -28,16 +26,8 @@ RUN if [ "$BUILD_TYPE" = "Debug" ]; then \
install_packages bc cgdb gawk gdb gzip iputils-ping jq netcat-openbsd procps ripgrep vim valgrind; \
fi

RUN mkdir -p /usr/src/kernels/4.18.0-372.53.1.el8_6.x86_64 && mkdir -p /lib/modules/4.18.0-372.53.1.el8_6.x86_64/
COPY --from=copier /usr/src/kernels/4.18.0-372.53.1.el8_6.x86_64/ /usr/src/kernels/4.18.0-372.53.1.el8_6.x86_64
COPY --from=copier /lib/modules/4.18.0-372.53.1.el8_6.x86_64/ /lib/modules/4.18.0-372.53.1.el8_6.x86_64


COPY srv /srv
WORKDIR /srv


RUN if [ ! -e /srv/kernel-collector ]; then \
ln /srv/kernel-collector-stripped /srv/kernel-collector; \
fi

0 comments on commit 0f1c7d0

Please sign in to comment.