From 5dc7b54c5e8799d246d93cc5e88477584a64ed71 Mon Sep 17 00:00:00 2001 From: Blesswin Samuel Date: Wed, 8 May 2024 04:34:29 +0530 Subject: [PATCH] amd64 build --- .github/workflows/docker-build.yml | 6 +++--- Dockerfile | 3 ++- Dockerfile.generate | 3 ++- internal/firewall/gen.go | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index d30d7db..fc61ca3 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -45,7 +45,7 @@ jobs: with: checkout: false slack-webhook: ${{ secrets.SLACK_WEBHOOK }} - docker-build-platforms: linux/arm64 + docker-build-platforms: linux/amd64 - name: Create release tarball if: ${{ startsWith(github.ref, 'refs/tags/') }} @@ -53,11 +53,11 @@ jobs: docker create ghcr.io/${{ github.repository }} > /tmp/container_id docker cp $(cat /tmp/container_id):/bin/ebpf-firewall ./router-monitor chmod +x router-monitor - tar czf router-monitor-aarch64-linux.tar.gz router-monitor + tar czf router-monitor-amd64-linux.tar.gz router-monitor - name: Create github release id: create_release uses: ncipollo/release-action@v1 if: ${{ startsWith(github.ref, 'refs/tags/') }} with: - artifacts: router-monitor-aarch64-linux.tar.gz + artifacts: router-monitor-amd64-linux.tar.gz diff --git a/Dockerfile b/Dockerfile index f7a2dbd..7183509 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,8 @@ RUN apt-get update && apt-get install -y \ # ; # RUN ln -sf /usr/include/asm-generic/ /usr/include/asm -RUN ln -sf /usr/include/aarch64-linux-gnu/asm/ /usr/include/asm +# RUN ln -sf /usr/include/aarch64-linux-gnu/asm/ /usr/include/asm +RUN ln -sf /usr/include/x86_64-linux-gnu/asm/ /usr/include/asm WORKDIR /src diff --git a/Dockerfile.generate b/Dockerfile.generate index 4c8b8ea..3868868 100644 --- a/Dockerfile.generate +++ b/Dockerfile.generate @@ -22,7 +22,8 @@ RUN apt-get update && apt-get install -y \ # ; # RUN ln -sf /usr/include/asm-generic/ /usr/include/asm -RUN ln -sf /usr/include/aarch64-linux-gnu/asm/ /usr/include/asm +# RUN ln -sf /usr/include/aarch64-linux-gnu/asm/ /usr/include/asm +RUN ln -sf /usr/include/x86_64-linux-gnu/asm/ /usr/include/asm WORKDIR /src diff --git a/internal/firewall/gen.go b/internal/firewall/gen.go index b5d4833..6b741f3 100644 --- a/internal/firewall/gen.go +++ b/internal/firewall/gen.go @@ -1,3 +1,3 @@ package firewall -//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target arm64 ebpfFirewall ebpf_firewall.c +//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target amd64 ebpfFirewall ebpf_firewall.c