Update Dockerfile for Go 1.18

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

.gitignore

@@ -2,7 +2,5 @@
 .vscode
 examples/
 dist
-faas-memory
-dive.log
+/faas-memory
 deployment/k8s/yaml/gateway-dep.yml
-vendor/

Dockerfile

@@ -1,6 +1,6 @@
-FROM teamserverless/license-check:0.3.6 as license-check
+FROM ghcr.io/openfaas/license-check:0.4.1 as license-check
 
-FROM golang:1.11 as build
+FROM golang:1.18 as build
 ENV CGO_ENABLED=0
 
 RUN mkdir -p /go/src/github.com/openfaas-incubator/faas-memory/

Makefile

@@ -24,7 +24,6 @@ build-local:
         -X github.com/openfaas-incubator/faas-memory/version.Version=${VERSION}" \
         -o faas-memory .
 
-
 .PHONY: start
 start: build-local
 	port=8083 ./faas-memory

go.mod

@@ -17,6 +17,6 @@ require (
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.32.1 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
-	golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
+	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
 	google.golang.org/protobuf v1.26.0 // indirect
 )

go.sum

@@ -152,8 +152,6 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/openfaas-incubator/faas-memory v0.0.0-20200210211844-76607688524f h1:psn2jzM/677FKiL/fbPcnUv5iXZ+Mek9J6hI6IY5/sE=
-github.com/openfaas-incubator/faas-memory v0.0.0-20200210211844-76607688524f/go.mod h1:ITZM/dbF6g8LpVf/3qrG5eup+7di/9DdoNm5Q268y7w=
 github.com/openfaas/faas-provider v0.19.0 h1:1dv4HDkWa9/yVkUll23/06y9lf8+tISOxYoHwBXZaJI=
 github.com/openfaas/faas-provider v0.19.0/go.mod h1:Farrp+9Med8LeK3aoYpqplMP8f5ebTILbCSLg2LPLZk=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -321,8 +319,9 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

handlers/info.go

@@ -26,7 +26,7 @@ func MakeInfoHandler(version, sha string) http.HandlerFunc {
 
 		infoResponse := typesv1.ProviderInfo{
 			Orchestration: OrchestrationIdentifier,
-			Name:      ProviderName,
+			Name:          ProviderName,
 			Version: &typesv1.VersionInfo{
 				Release: version,
 				SHA:     sha,

scripts/goimportscheck.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+PATH=$PATH:$(go env GOPATH)/bin
+
 # Check goimports
 echo "==> Checking that code complies with goimports requirements..."
 goimports_files=$(goimports -l `find . -name '*.go' | grep -v vendor`)