Merge pull request #112 from doitintl/cicd/speedup

cicd/speedup

.github/workflows/build.yaml

@@ -26,21 +26,12 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       - name: set up Docker buildx
         id: buildx
         uses: docker/setup-buildx-action@v3
         with:
           version: latest
 
-      - name: builder instance name
-        run: echo ${{ steps.buildx.outputs.name }}
-
-      - name: available platforms
-        run: echo ${{ steps.buildx.outputs.platforms }}
-
       - name: decide on tag
         id: prep
         run: |
@@ -67,7 +58,6 @@ jobs:
           echo "tags=${TAGS}" >> $GITHUB_OUTPUT
 
       - name: login to DockerHub
-        if: ${{ github.event_name != 'pull_request' }}
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -77,8 +67,10 @@ jobs:
         id: docker_build
         uses: docker/build-push-action@v5
         with:
-          push: ${{ github.event_name != 'pull_request' }}
-          platforms: linux/amd64,linux/arm64
+          push: true
+          platforms: |
+            linux/amd64
+            linux/arm64
           tags: ${{ steps.prep.outputs.tags }}
 
       - name: image digest

Dockerfile

@@ -1,26 +1,29 @@
-# syntax = docker/dockerfile:experimental
-
-#
-# ----- Go Builder Image ------
-#
-FROM golang:1.20-alpine AS builder
+FROM --platform=$BUILDPLATFORM golang:1.20-alpine AS builder
 # curl git bash
 RUN apk add --no-cache curl git bash make
-#
+
 # ----- build and test -----
-#
 FROM builder as build
+
 # set working directorydoc
 RUN mkdir -p /go/src/app
 WORKDIR /go/src/app
+
 # load dependency
+COPY Makefile .
 COPY go.mod .
 COPY go.sum .
-RUN --mount=type=cache,target=$GOPATH/pkg/mod go mod download
+RUN --mount=type=cache,target=/root/.cache/go-build go mod download
+
 # copy sources
 COPY . .
+
+# build arguments (passed from buildx)
+ARG TARGETOS
+ARG TARGETARCH
+
 # build
-RUN make binary
+RUN --mount=type=cache,target=/root/.cache/go-build make binary TARGETOS=${TARGETOS} TARGETARCH=${TARGETARCH}
 
 #
 # ------ release Docker image ------

Makefile

@@ -8,25 +8,28 @@ PKGS     = $(or $(PKG),$(shell env GO111MODULE=on $(GO) list ./...))
 TESTPKGS = $(shell env GO111MODULE=on $(GO) list -f \
 			'{{ if or .TestGoFiles .XTestGoFiles }}{{ .ImportPath }}{{ end }}' \
 			$(PKGS))
-BIN      = $(CURDIR)/.bin
-BINARY = kubeip
+
+BIN        := $(CURDIR)/.bin
+BINARY      = kubeip
+TARGETOS   := $(or $(TARGETOS), linux)
+TARGETARCH := $(or $(TARGETARCH), amd64)
 
 GO      = go
 TIMEOUT = 15
 V = 0
 Q = $(if $(filter 1,$V),,@)
 M = $(shell printf "\033[34;1m▶\033[0m")
 
-export GO111MODULE=on
 export CGO_ENABLED=0
 export GOPROXY=https://proxy.golang.org
-
+export GOOS=$(TARGETOS)
+export GOARCH=$(TARGETARCH)
 
 .PHONY: all
 all: fmt lint binary
 
 .PHONY: binary
-binary: $(BIN) ; $(info $(M) building executable...) @ ## Build program binary
+binary: $(BIN) ; $(info $(M) building $(GOOS)/$(GOARCH) binary...) @ ## Build program binary
 	$Q $(GO) build \
 		-tags release \
 		-ldflags '-X main.version=$(VERSION) -X main.buildDate=$(DATE)' \

main.go

@@ -33,6 +33,7 @@ var buildDate string
 
 func main() {
 	config, _ = cfg.NewConfig()
+	logrus.Info("kubeIP version: ", version)
 	logrus.Info(config)
 	cluster, err := kipcompute.ClusterName()
 	if err != nil {