diff --git a/Makefile b/Makefile index 5c8b372494..68dedddb84 100644 --- a/Makefile +++ b/Makefile @@ -232,6 +232,7 @@ publish-jaeger: .PHONY: clean clean: -(cd $(DEEPFENCE_AGENT_DIR) && make clean) + -(cd $(DEEPFENCE_FARGATE_DIR) && rm -rf deepfence-agent-bin-$(VERSION)*) -(cd $(ROOT_MAKEFILE_DIR)/deepfence_server && make clean) -(cd $(ROOT_MAKEFILE_DIR)/deepfence_worker && make clean) -(cd $(DEEPFENCED) && make clean && rm $(DEEPFENCE_AGENT_DIR)/deepfenced) diff --git a/deepfence_agent/fargate/bin-arm64/bash b/deepfence_agent/fargate/bin-arm64/bash new file mode 100755 index 0000000000..3edbfc1667 Binary files /dev/null and b/deepfence_agent/fargate/bin-arm64/bash differ diff --git a/deepfence_agent/fargate/bin-arm64/busybox b/deepfence_agent/fargate/bin-arm64/busybox new file mode 100755 index 0000000000..ccb1690bac Binary files /dev/null and b/deepfence_agent/fargate/bin-arm64/busybox differ diff --git a/deepfence_agent/fargate/copy-bin-from-agent.sh b/deepfence_agent/fargate/copy-bin-from-agent.sh index 3d01ba0f47..ba96f5bb14 100644 --- a/deepfence_agent/fargate/copy-bin-from-agent.sh +++ b/deepfence_agent/fargate/copy-bin-from-agent.sh @@ -23,9 +23,38 @@ rm -rf $folder # create folder mkdir -p $folder +copy_bin_amd64() { + cp -R bin $folder/ +} + +copy_bin_arm64() { + cp -R bin-arm64 $folder/ + cp $folder/busybox $folder/cat + cp $folder/busybox $folder/chmod + cp $folder/busybox $folder/cp + cp $folder/busybox $folder/gzip + cp $folder/busybox $folder/hostname + cp $folder/busybox $folder/kill + cp $folder/busybox $folder/ln + cp $folder/busybox $folder/ls + cp $folder/busybox $folder/mkdir + cp $folder/busybox $folder/nice + cp $folder/busybox $folder/rm + cp $folder/busybox $folder/sed + cp $folder/busybox $folder/sleep + cp $folder/busybox $folder/tar +} + copy() { echo "Copying ..." - cp -R bin $folder/ + + architecture=$(uname -m) + if [[ $architecture == "aarch64" || $architecture == "arm" ]]; then + copy_bin_arm64 + else + copy_bin_amd64 + fi + deep_docker_copy "/bin/deepfenced" "$folder/bin/." deep_docker_copy "/home/." "$folder/home/." deep_docker_copy "/opt/." "$folder/opt/." @@ -50,9 +79,10 @@ copy echo "Creating tar.gz file..." rm -rf $folder.tar.gz +sudo chown -R root:root $folder cd $folder -tar -czvf $folder.tar.gz . -mv $folder.tar.gz ../ +sudo tar -czvf $folder.tar.gz . +sudo mv $folder.tar.gz ../ cd ../ # rm -rf $folder