amd64 build

blesswinsamuel · May 7, 2024 · 5dc7b54 · 5dc7b54
1 parent 71cfff5
commit 5dc7b54
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -45,19 +45,19 @@ 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/') }}
         run: |
           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
@@ -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
@@ -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
@@ -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