From da7c7b83d34d1871f0de99c22b09e820365e0dfd Mon Sep 17 00:00:00 2001
From: Chris Bellew <cjbellew@gmail.com>
Date: Mon, 27 May 2024 21:26:44 +0800
Subject: [PATCH] Build

---
 .github/workflows/build.yml | 18 +-----------------
 Dockerfile.mac              |  5 +++--
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 50d8c3e..3cc1ab1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,25 +31,9 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      # - name: Cache Docker layers
-      #   uses: actions/cache@v2
-      #   with:
-      #     path: /tmp/.buildx-cache
-      #     key: ${{ runner.os }}-buildx-${{ github.ref }}-${{ hashFiles('Dockerfile') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-buildx-${{ github.ref }}-
-      #       ${{ runner.os }}-buildx-
-
       - name: Build and push Docker image
         uses: docker/build-push-action@v4
         with:
           context: .
           file: Dockerfile.mac
-          #push: true
-          #tags: ${{ secrets.DOCKER_USERNAME }}/pg-ferret:latest
-          platforms: linux/arm64 #linux/amd64,
-          # cache-from: type=local,src=/tmp/.buildx-cache
-          # cache-to: type=local,dest=/tmp/.buildx-cache
-
-      # - name: Verify multi-architecture image
-      #   run: docker run --rm ${{ secrets.DOCKER_USERNAME }}/pg-ferret:latest uname -m
+          platforms: linux/arm64
diff --git a/Dockerfile.mac b/Dockerfile.mac
index 69f4631..b122b57 100644
--- a/Dockerfile.mac
+++ b/Dockerfile.mac
@@ -6,7 +6,9 @@ RUN apt-get install -y wget
 
 WORKDIR /app
 
-RUN apt-get install -y build-essential systemtap-sdt-dev libreadline-dev zlib1g-dev libsystemd-dev libicu-dev
+RUN apt-get install -y build-essential systemtap-sdt-dev libreadline-dev zlib1g-dev libsystemd-dev libicu-dev llvm-18-dev libclang-18-dev libpolly-18-dev
+
+RUN llvm-config --version
 
 # Install rust 
 RUN apt-get update
@@ -17,7 +19,6 @@ RUN rustup toolchain install nightly-aarch64-unknown-linux-gnu
 RUN rustup default nightly-aarch64-unknown-linux-gnu
 
 # Install bpf tools'
-RUN apt-get install -y llvm-18-dev libclang-18-dev libpolly-18-dev
 RUN cargo install bpf-linker --no-default-features
 WORKDIR /app
 RUN git clone --recurse-submodules https://github.com/libbpf/bpftool.git