improve docker build

Signed-off-by: Markus Blaschke <mblaschke82@gmail.com>

Author: mblaschke

Dockerfile

@@ -1,23 +1,38 @@
-FROM golang:1.18-alpine as build
+#############################################
+# Build
+#############################################
+FROM --platform=$BUILDPLATFORM golang:1.18-alpine as build
 
 RUN apk upgrade --no-cache --force
 RUN apk add --update build-base make git
 
 WORKDIR /go/src/github.com/webdevops/azure-auditor
 
+# Dependencies
+COPY go.mod go.sum .
+RUN go mod download
+
 # Compile
-COPY ./ /go/src/github.com/webdevops/azure-auditor
-RUN make dependencies
-#RUN make test
-RUN make build
-RUN ./azure-auditor --help
+COPY . .
+RUN make test
+ARG TARGETOS TARGETARCH
+RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} make build
 
 #############################################
-# FINAL IMAGE
+# Test
 #############################################
-FROM gcr.io/distroless/static
+FROM gcr.io/distroless/static as test
 ENV LOG_JSON=1
 COPY --from=build /go/src/github.com/webdevops/azure-auditor/azure-auditor /
 COPY --from=build /go/src/github.com/webdevops/azure-auditor/templates/ /templates/
+RUN ["/azure-auditor", "--help"]
+
+#############################################
+# Final
+#############################################
+FROM gcr.io/distroless/static
+ENV LOG_JSON=1
+COPY --from=test /azure-auditor /
+COPY --from=test /go/src/github.com/webdevops/azure-auditor/templates/ /templates/
 USER 1000:1000
 ENTRYPOINT ["/azure-auditor"]

Makefile

@@ -1,7 +1,7 @@
 PROJECT_NAME		:= $(shell basename $(CURDIR))
 GIT_TAG				:= $(shell git describe --dirty --tags --always)
 GIT_COMMIT			:= $(shell git rev-parse --short HEAD)
-LDFLAGS				:= -X "main.gitTag=$(GIT_TAG)" -X "main.gitCommit=$(GIT_COMMIT)" -linkmode external -extldflags "-static" -s -w
+LDFLAGS				:= -X "main.gitTag=$(GIT_TAG)" -X "main.gitCommit=$(GIT_COMMIT)" -extldflags "-static" -s -w
 
 FIRST_GOPATH			:= $(firstword $(subst :, ,$(shell go env GOPATH)))
 GOLANGCI_LINT_BIN		:= $(FIRST_GOPATH)/bin/golangci-lint
@@ -16,7 +16,7 @@ clean:
 
 .PHONY: build
 build:
-	CGO_ENABLED=0 go build -a -ldflags '$(LDFLAGS)' -o $(PROJECT_NAME) .
+	GOOS=${GOOS} GOARCH=${GOARCH} CGO_ENABLED=0 go build -a -ldflags '$(LDFLAGS)' -o $(PROJECT_NAME) .
 
 .PHONY: vendor
 vendor:
@@ -29,7 +29,8 @@ image: build
 	docker build -t $(PROJECT_NAME):$(GIT_TAG) .
 
 build-push-development:
-	docker build -t webdevops/$(PROJECT_NAME):development . && docker push webdevops/$(PROJECT_NAME):development
+	docker buildx create --use
+	docker buildx build -t webdevops/$(PROJECT_NAME):development --platform linux/amd64,linux/arm,linux/arm64 --push .
 
 .PHONY: test
 test: