From cd9f866d6bd7bb1715a8d69bcfeb0bd56b176f34 Mon Sep 17 00:00:00 2001 From: "M. Mert Yildiran" Date: Sun, 19 Jun 2022 13:46:33 +0300 Subject: [PATCH] Generate both endianness --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index fa6a03849..b91b9cc81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,27 +44,27 @@ RUN ./install-capstone.sh ### Intermediate builder image for x86-64 to x86-64 native builds FROM builder-native-base AS builder-from-amd64-to-amd64 ENV GOARCH=amd64 -ENV BPF_TARGET=amd64 BPF_CFLAGS="-O2 -g -D__TARGET_ARCH_x86" +ENV BPF_TARGET_EL=amd64 BPF_TARGET_EB=amd64 BPF_CFLAGS="-O2 -g -D__TARGET_ARCH_x86" ### Intermediate builder image for AArch64 to AArch64 native builds FROM builder-native-base AS builder-from-arm64v8-to-arm64v8 ENV GOARCH=arm64 -ENV BPF_TARGET=arm64 BPF_CFLAGS="-O2 -g -D__TARGET_ARCH_arm64" +ENV BPF_TARGET_EL=arm64 BPF_TARGET_EB=arm64be BPF_CFLAGS="-O2 -g -D__TARGET_ARCH_arm64" ### Builder image for x86-64 to AArch64 cross-compilation FROM up9inc/linux-arm64-musl-go-libpcap-capstone-bpf AS builder-from-amd64-to-arm64v8 ENV CGO_ENABLED=1 GOOS=linux ENV GOARCH=arm64 CGO_CFLAGS="-I/work/libpcap -I/work/capstone/include" -ENV BPF_TARGET=arm64 BPF_CFLAGS="-O2 -g -D__TARGET_ARCH_arm64 -I/usr/xcc/aarch64-linux-musl-cross/aarch64-linux-musl/include/" +ENV BPF_TARGET_EL=arm64 BPF_TARGET_EB=arm64be BPF_CFLAGS="-O2 -g -D__TARGET_ARCH_arm64 -I/usr/xcc/aarch64-linux-musl-cross/aarch64-linux-musl/include/" ### Builder image for AArch64 to x86-64 cross-compilation FROM up9inc/linux-x86_64-musl-go-libpcap-capstone-bpf AS builder-from-arm64v8-to-amd64 ENV CGO_ENABLED=1 GOOS=linux ENV GOARCH=amd64 CGO_CFLAGS="-I/libpcap -I/capstone/include" -ENV BPF_TARGET=amd64 BPF_CFLAGS="-O2 -g -D__TARGET_ARCH_x86 -I/usr/local/musl/x86_64-unknown-linux-musl/include/" +ENV BPF_TARGET_EL=amd64 BPF_TARGET_EB=amd64 BPF_CFLAGS="-O2 -g -D__TARGET_ARCH_x86 -I/usr/local/musl/x86_64-unknown-linux-musl/include/" ### Final builder image where the build happens @@ -106,7 +106,8 @@ ARG VER=0.0 WORKDIR /app/tap/tlstapper RUN rm tlstapper_bpf* -RUN GOARCH=${BUILDARCH} go generate tls_tapper.go +RUN BPF_TARGET=BPF_TARGET_EL GOARCH=${BUILDARCH} go generate tls_tapper.go +RUN BPF_TARGET=BPF_TARGET_EB GOARCH=${BUILDARCH} go generate tls_tapper.go WORKDIR /app/agent-build