From 514b5a9bf0bc3247e0826226f8d41a37b55f0800 Mon Sep 17 00:00:00 2001 From: Philip Schmid Date: Tue, 1 Oct 2024 10:29:09 +0200 Subject: [PATCH 1/2] image: Install iproute2 without APK cache Signed-off-by: Philip Schmid --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index da16a7ef6cf..611b3b948f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -83,7 +83,7 @@ RUN curl -L https://github.com/libbpf/bpftool/releases/download/${BPFTOOL_TAG}/b # Almost final step runs on target platform (might need emulation) and # retrieves (cross-)compiled binaries from builders FROM docker.io/library/alpine:3.20.3@sha256:beefdbd8a1da6d2915566fde36db9db0b524eb737fc57cd1367effd16dc0d06d AS base-build -RUN apk add iproute2 +RUN apk add --no-cache iproute2 RUN mkdir /var/lib/tetragon/ && \ mkdir -p /etc/tetragon/tetragon.conf.d/ && \ mkdir -p /etc/tetragon/tetragon.tp.d/ && \ From ce932cd9ab7ae6dd11172690e3b0ae3823667b8d Mon Sep 17 00:00:00 2001 From: Philip Schmid Date: Tue, 1 Oct 2024 14:38:32 +0200 Subject: [PATCH 2/2] image: Improved bash-completions for tetra and ip Signed-off-by: Philip Schmid --- Dockerfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Dockerfile b/Dockerfile index 611b3b948f1..40ac4d9efd8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -80,6 +80,14 @@ ARG TARGETARCH ARG BPFTOOL_TAG=v7.2.0-snapshot.0 RUN curl -L https://github.com/libbpf/bpftool/releases/download/${BPFTOOL_TAG}/bpftool-${BPFTOOL_TAG}-${TARGETARCH}.tar.gz | tar xz && chmod +x bpftool +# Get bash-completion manifests and generate tetra CLI bash +# autocompletions (we don't want all bash-completions in the base-build) +FROM docker.io/library/alpine:3.20.3@sha256:beefdbd8a1da6d2915566fde36db9db0b524eb737fc57cd1367effd16dc0d06d AS cli-autocomplete +COPY --from=tetragon-builder /go/src/github.com/cilium/tetragon/tetra /usr/bin/ +RUN apk add --no-cache bash-completion && \ + tetra completion bash > /etc/bash_completion.d/tetra && \ + chmod a+r /etc/bash_completion.d/tetra + # Almost final step runs on target platform (might need emulation) and # retrieves (cross-)compiled binaries from builders FROM docker.io/library/alpine:3.20.3@sha256:beefdbd8a1da6d2915566fde36db9db0b524eb737fc57cd1367effd16dc0d06d AS base-build @@ -94,6 +102,11 @@ COPY --from=tetragon-builder /go/src/github.com/cilium/tetragon/contrib/tetragon COPY --from=tetragon-builder /go/src/github.com/cilium/tetragon/contrib/tetragon-rthooks/tetragon-oci-hook-setup /usr/bin/ COPY --from=gops /gops/gops /usr/bin/ COPY --from=bpf-builder /go/src/github.com/cilium/tetragon/bpf/objs/*.o /var/lib/tetragon/ +COPY --from=cli-autocomplete /etc/bash/bash_completion.sh /etc/bash/bash_completion.sh +COPY --from=cli-autocomplete /etc/bash_completion.d/000_bash_completion_compat.bash /etc/bash_completion.d/000_bash_completion_compat.bash +COPY --from=cli-autocomplete /etc/bash_completion.d/tetra /etc/bash_completion.d/tetra +COPY --from=cli-autocomplete /usr/share/bash-completion/bash_completion /usr/share/bash-completion/bash_completion +COPY --from=cli-autocomplete /usr/share/bash-completion/completions/ip /usr/share/bash-completion/completions/ip ENTRYPOINT ["/usr/bin/tetragon"] # This target only builds with the `--target release` option and reduces the