Resolve version from GitHub Action and move to Go 1.17

* As per other projects, the version is determined from the
execution environment, and not from within the Docker build
stage. This means there's no need to copy the .git folder
into the build context.
* Moves to Go 1.17 for building the operator/controller.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>

Author: alexellis

.dockerignore

@@ -7,3 +7,4 @@
 /artifacts
 /hack
 /docs
+/.git

.github/workflows/build.yaml

@@ -10,7 +10,7 @@ jobs:
   build:
     strategy:
       matrix:
-        go-version: [1.16.x]
+        go-version: [1.17.x]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
 
@@ -28,6 +28,9 @@ jobs:
       - name: Get Repo Owner
         id: get_repo_owner
         run: echo ::set-output name=repo_owner::$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')
+      - name: Get git commit
+        id: get_git_commit
+        run: echo "GIT_COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
 
       - name: Build x86_64 container into library
         uses: docker/build-push-action@v2
@@ -36,6 +39,9 @@ jobs:
           file: ./Dockerfile
           outputs: "type=docker,push=false"
           platforms: linux/amd64
+          build-args: |
+            GIT_COMMIT=dev-${{env.GIT_COMMIT}}
+            VERSION=dev-${{env.GIT_COMMIT}}
           tags: |
             ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/faas-netes:${{ github.sha }}
 
@@ -46,6 +52,9 @@ jobs:
           file: ./Dockerfile
           outputs: "type=image,push=false"
           platforms: linux/amd64,linux/arm/v7,linux/arm64
+          build-args: |
+            GIT_COMMIT=dev-${{env.GIT_COMMIT}}
+            VERSION=dev-${{env.GIT_COMMIT}}
           tags: |
             ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/faas-netes:${{ github.sha }}
  # Todo - load the image into Kind before running tests

.github/workflows/publish.yaml

@@ -9,7 +9,7 @@ jobs:
   publish:
     strategy:
       matrix:
-        go-version: [1.16.x]
+        go-version: [1.17.x]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     permissions:
@@ -43,6 +43,12 @@ jobs:
       - name: Get Repo Owner
         id: get_repo_owner
         run: echo ::set-output name=repo_owner::$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')
+      - name: Get git commit
+        id: get_git_commit
+        run: echo "GIT_COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
+      - name: Get version
+        id: get_version
+        run: echo "VERSION=$(git describe --tags --dirty)" >> $GITHUB_ENV
 
       - name: Push containers
         uses: docker/build-push-action@v2
@@ -51,6 +57,9 @@ jobs:
           file: ./Dockerfile
           outputs: "type=registry,push=true"
           platforms: linux/amd64,linux/arm/v7,linux/arm64
+          build-args: |
+            GIT_COMMIT=${{env.GIT_COMMIT}}
+            VERSION=${{env.VERSION}}
           tags: |
             ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/faas-netes:${{ github.sha }}
             ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/faas-netes:${{ steps.get_tag.outputs.TAG }}

Dockerfile

@@ -1,12 +1,15 @@
 FROM teamserverless/license-check:0.3.9 as license-check
 
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.16 as build
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17 as build
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 ARG TARGETOS
 ARG TARGETARCH
 
+ARG VERSION
+ARG GIT_COMMIT
+
 ENV CGO_ENABLED=0
 ENV GO111MODULE=on
 ENV GOFLAGS=-mod=vendor
@@ -20,9 +23,7 @@ RUN license-check -path /go/src/github.com/openfaas/faas-netes/ --verbose=false
 RUN gofmt -l -d $(find . -type f -name '*.go' -not -path "./vendor/*")
 RUN CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS} GOARCH=${TARGETARCH} go test -v ./...
 
-RUN VERSION=$(git describe --all --exact-match `git rev-parse HEAD` | grep tags | sed 's/tags\///') \
-    && GIT_COMMIT=$(git rev-list -1 HEAD) \
-    && GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=${CGO_ENABLED} go build \
+RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build \
         --ldflags "-s -w \
         -X github.com/openfaas/faas-netes/version.GitCommit=${GIT_COMMIT}\
         -X github.com/openfaas/faas-netes/version.Version=${VERSION}" \

Makefile

@@ -1,15 +1,21 @@
 .PHONY: build local push namespaces install charts start-kind stop-kind build-buildx render-charts
+IMG_NAME?=faas-netes
+
 TAG?=latest
 OWNER?=openfaas
 SERVER?=ghcr.io
 export DOCKER_CLI_EXPERIMENTAL=enabled
+export DOCKER_BUILDKIT=1
 
 TOOLS_DIR := .tools
 
 GOPATH := $(shell go env GOPATH)
 CODEGEN_VERSION := $(shell hack/print-codegen-version.sh)
 CODEGEN_PKG := $(GOPATH)/pkg/mod/k8s.io/code-generator@${CODEGEN_VERSION}
 
+VERSION := $(shell git describe --tags --dirty)
+GIT_COMMIT := $(shell git rev-parse HEAD)
+
 all: build-docker
 
 $(TOOLS_DIR)/code-generator.mod: go.mod
@@ -25,16 +31,20 @@ local:
 
 build-docker:
 	docker build \
-	-t $(SERVER)/$(OWNER)/faas-netes:$(TAG) .
+	--build-arg GIT_COMMIT=$(GIT_COMMIT) \
+	--build-arg VERSION=$(VERSION) \
+	-t $(SERVER)/$(OWNER)/$(IMG_NAME):$(TAG) .
 
 .PHONY: build-buildx
 build-buildx:
-	@echo $(SERVER)/$(OWNER)/faas-netes:$(TAG) && \
+	@echo $(SERVER)/$(OWNER)/$(IMG_NAME):$(TAG) && \
 	docker buildx create --use --name=multiarch --node=multiarch && \
 	docker buildx build \
 		--push \
 		--platform linux/amd64 \
-		--tag $(SERVER)/$(OWNER)/faas-netes:$(TAG) \
+        --build-arg GIT_COMMIT=$(GIT_COMMIT) \
+        --build-arg VERSION=$(VERSION) \
+		--tag $(SERVER)/$(OWNER)/$(IMG_NAME):$(TAG) \
 		.
 
 .PHONY: build-buildx-all
@@ -43,21 +53,25 @@ build-buildx-all:
 	docker buildx build \
 		--platform linux/amd64,linux/arm/v7,linux/arm64 \
 		--output "type=image,push=false" \
-		--tag $(SERVER)/$(OWNER)/faas-netes:$(TAG) \
+        --build-arg GIT_COMMIT=$(GIT_COMMIT) \
+        --build-arg VERSION=$(VERSION) \
+		--tag $(SERVER)/$(OWNER)/$(IMG_NAME):$(TAG) \
 		.
 
 .PHONY: publish-buildx-all
 publish-buildx-all:
-	@echo  $(SERVER)/$(OWNER)/faas-netes:$(TAG) && \
+	@echo  $(SERVER)/$(OWNER)/$(IMG_NAME):$(TAG) && \
 	docker buildx create --use --name=multiarch --node=multiarch && \
 	docker buildx build \
 		--platform linux/amd64,linux/arm/v7,linux/arm64 \
 		--push=true \
-		--tag $(SERVER)/$(OWNER)/faas-netes:$(TAG) \
+        --build-arg GIT_COMMIT=$(GIT_COMMIT) \
+        --build-arg VERSION=$(VERSION) \
+		--tag $(SERVER)/$(OWNER)/$(IMG_NAME):$(TAG) \
 		.
 
 push:
-	docker push $(SERVER)/$(OWNER)/faas-netes:$(TAG)
+	docker push $(SERVER)/$(OWNER)/$(IMG_NAME):$(TAG)
 
 charts:
 	cd chart && helm package openfaas/ && helm package kafka-connector/ && helm package cron-connector/ && helm package nats-connector/ && helm package mqtt-connector/ && helm package pro-builder/  && helm package sqs-connector/