Fix-darwin-arm-release (#237)

* fix darwin arm release * typo release name
DataDog · Aug 2, 2024 · b7c6305 · b7c6305
1 parent 468926c
commit b7c6305
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml
@@ -86,7 +86,7 @@ jobs:
         name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: compose
+          name: kubehound
           path: ./bin/release/*
           if-no-files-found: error
 
@@ -105,7 +105,7 @@ jobs:
         name: Download artifacts
         uses: actions/download-artifact@v3
         with:
-          name: compose
+          name: kubehound
           path: bin/release
       -
         name: Create checksums

diff --git a/Dockerfile b/Dockerfile
@@ -97,7 +97,8 @@ RUN --mount=from=binary \
     mkdir -p /out && \
     # TODO: should just use standard arch
     TARGETARCH=$([ "$TARGETARCH" = "amd64" ] && echo "x86_64" || echo "$TARGETARCH"); \
-    TARGETARCH=$([ "$TARGETARCH" = "arm64" ] && echo "aarch64" || echo "$TARGETARCH"); \
+    # Use arm64 for darwin
+    TARGETARCH=$([ "$TARGETARCH" = "arm64" ] && [ "$TARGETOS" != "darwin" ] && echo "aarch64" || echo "$TARGETARCH"); \
     cp kubehound* "/out/kubehound-${TARGETOS}-${TARGETARCH}${TARGETVARIANT}$(ls kubehound* | sed -e 's/^kubehound//')"
 
 FROM scratch AS release