v0.0.2.5

.github/workflows/docker.yml

@@ -62,6 +62,16 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      # setup Docker build action
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+        with:
+          platforms: 'arm64,arm'
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+
       # Container image names need to be lowercased. This changes the 'IMAGE_NAME'
       # variable to all lowercase letters
       - name: Lowercase the server container image name
@@ -104,8 +114,6 @@ jobs:
           platforms: |-
             linux/amd64
             linux/arm64
-            darwin/amd64
-            darwin/arm64
 
       # The Dockerfile which Mythic uses to pull in the base container image needs to be
       # updated to reference the newly built container image

Makefile

@@ -5,7 +5,7 @@ linux:
 	cd Mythic_CLI && make && mv mythic-cli ../
 
 macos:
-	cd Mythic_CLI && make build_all_macos && mv mythic-cli ../
+	cd Mythic_CLI && make build_macos && mv mythic-cli ../
 
 macos_local:
 	cd Mythic_CLI && make build_binary_macos_local

Mythic_CLI/.docker/Dockerfile

@@ -10,12 +10,9 @@ RUN go env -w GO111MODULE=${GO111MODULE}
 
 COPY ["src/", "."]
 
-RUN make build
-#RUN go mod tidy
-
-
-#CMD ["/bin/bash", "-c", "make", "build"]
+RUN make build_all
 
 FROM alpine
 
-COPY --from=0 /usr/src/app/mythic-cli /mythic-cli
+COPY --from=0 /usr/src/app/mythic-cli_linux /mythic-cli_linux
+COPY --from=0 /usr/src/app/mythic-cli_macos /mythic-cli_macos

Mythic_CLI/Makefile

@@ -2,7 +2,7 @@ BINARY_NAME=mythic-cli
 LOCAL_PATH=$(shell pwd)
 BUILDER_IMAGE=ghcr.io/its-a-feature/mythic_cli:v0.0.2.3
 .PHONY: default
-default: build_all_linux ;
+default: build_linux ;
 
 # pull in build and env options from global settings
 -include ../build.env
@@ -10,16 +10,16 @@ default: build_all_linux ;
 
 export
 
-build_binary:
-	docker run -v ${LOCAL_PATH}/copy_file/:/copy_file/ --rm -ti ${BUILDER_IMAGE} sh -c "cp /mythic-cli /copy_file/mythic-cli"
+build_binary_linux:
+	docker run -v ${LOCAL_PATH}/copy_file/:/copy_file/ --rm -ti ${BUILDER_IMAGE} sh -c "cp /mythic-cli_linux /copy_file/mythic-cli"
 	mv ./copy_file/${BINARY_NAME} . && rm -rf ./copy_file && chmod +x ${BINARY_NAME}
 
 build_binary_macos:
-	docker run -v ${LOCAL_PATH}/copy_file/:/copy_file/ --rm -ti ${BUILDER_IMAGE} sh -c "cp /mythic-cli /copy_file/mythic-cli"
+	docker run -v ${LOCAL_PATH}/copy_file/:/copy_file/ --rm -ti ${BUILDER_IMAGE} sh -c "cp /mythic-cli_macos /copy_file/mythic-cli"
 	mv ./copy_file/${BINARY_NAME} . && rm -rf ./copy_file && chmod +x ${BINARY_NAME}
 
 build_binary_macos_local:
 	cd src && go build -o ../../mythic-cli .
 
-build_all_linux: build_binary
-build_all_macos: build_binary_macos
+build_linux: build_binary_linux
+build_macos: build_binary_macos

Mythic_CLI/src/Makefile

@@ -8,10 +8,12 @@ build:
 	go build -o ${BINARY_NAME} .
 	
 build_linux:
-	GOOS=linux go build -o ${BINARY_NAME} .
+	GOOS=linux go build -o ${BINARY_NAME}_linux .
 
 build_macos:
-	GOOS=darwin go build -o ${BINARY_NAME} .
+	GOOS=darwin go build -o ${BINARY_NAME}_macos .
+
+build_all: build_linux build_macos
 
 run:
 	./${BINARY_NAME}