From 683a190855509df8776f3ff8d37cc638dc272e8c Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Tue, 23 Sep 2025 04:03:27 +0000 Subject: [PATCH] chore: install xdpdump in relay container (#10423) Instead of the additional dockerfile, we can simply install the xdptools from the repository and have them available right in the relay container. --- rust/Dockerfile | 1 + rust/Dockerfile.xdp-tools | 27 --------------------------- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 rust/Dockerfile.xdp-tools diff --git a/rust/Dockerfile b/rust/Dockerfile index 704d6c2ad..2fb2dd80c 100644 --- a/rust/Dockerfile +++ b/rust/Dockerfile @@ -23,6 +23,7 @@ COPY ./docker-init-gateway.sh ./docker-init.sh # Relay specific runtime base image FROM runtime_base AS runtime_firezone-relay +RUN apk add --no-cache --update xdp-tools COPY ./docker-init-relay.sh ./docker-init.sh # Headless-client specific runtime base image diff --git a/rust/Dockerfile.xdp-tools b/rust/Dockerfile.xdp-tools deleted file mode 100644 index 7a2837284..000000000 --- a/rust/Dockerfile.xdp-tools +++ /dev/null @@ -1,27 +0,0 @@ -# This Dockerfile can be used to build an xdp-tools debug image we can pull on the Relays -# to help debugging our eBPF XDP TURN server. -# -# An image has already been built and pushed at us-east1-docker.pkg.dev/firezone-staging/firezone/xdp-tools:latest -# To update it: -# > docker buildx build -f Dockerfile.xdp-tools -t us-east1-docker.pkg.dev/firezone-staging/firezone/xdp-tools:latest --platform linux/amd64,linux/arm64 . -# > docker push us-east1-docker.pkg.dev/firezone-staging/firezone/xdp-tools:latest - -# See https://github.com/xdp-project/xdp-tools for more information. - -FROM alpine:latest - -RUN apk add --no-cache --update \ - git \ - clang \ - pkgconfig \ - autoconf \ - make \ - m4 \ - libbpf-dev \ - libpcap-dev \ - linux-headers - -RUN git clone https://github.com/xdp-project/xdp-tools.git -RUN cd xdp-tools && ./configure && make && make install - -ENTRYPOINT ["/bin/sh"]