Refactor reverse proxy configuration to include libbpf-dev dependency

arloor · Oct 22, 2024 · ef71fbe · ef71fbe
1 parent 1090d56
commit ef71fbe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -73,12 +73,14 @@ jobs:
         uses: arloor/rust_musl_action@latest
         with:
           use_musl: false
-          extra_deps: cmake zlib1g-dev libelf-dev pkg-config clang autoconf autopoint flex bison gawk make
+          extra_deps: cmake zlib1g-dev libelf-dev pkg-config clang autoconf autopoint flex bison gawk make libbpf-dev
           after_install: |
             ls -lh /usr/lib/x86_64-linux-gnu/libelf.a
+            export LIBBPF_SYS_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu
+            echo \$LIBBPF_SYS_LIBRARY_PATH
           args: -p rust_http_proxy --no-default-features --features aws_lc_rs,bpf_vendored
           apt_mirror: mirrors.mit.edu
-          rust_flags: -C target-feature=+crt-static -L /usr/lib/x86_64-linux-gnu
+          rust_flags: -C target-feature=+crt-static
           debug: false
       - name: docker build and push
         if: github.event_name == 'push' && github.ref == 'refs/heads/master' 

diff --git a/rust_http_proxy/Cargo.toml b/rust_http_proxy/Cargo.toml
@@ -65,7 +65,7 @@ bpf_static = [
     "bpf",
     "libbpf-sys/static-zlib",
     "libbpf-sys/static-libelf",
-    "libbpf-sys/vendored-libbpf",
+    "libbpf-sys/static-libbpf",
 ]
 aws_lc_rs = ["tokio-rustls/aws-lc-rs", "hyper-rustls/aws-lc-rs"]
 ring = ["tokio-rustls/ring", "hyper-rustls/ring"]