From 14ff070469d8a1e1f1ea61df9593281f3147e238 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Mon, 26 Jul 2021 14:56:29 +0200
Subject: [PATCH] Dockerfile: use "go install" to install utilities

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 Dockerfile.windows                              | 11 +++++------
 hack/dockerfile/install/golangci_lint.installer |  4 ++--
 hack/dockerfile/install/gotestsum.installer     |  4 ++--
 hack/dockerfile/install/shfmt.installer         |  5 +----
 hack/dockerfile/install/tomll.installer         |  3 +--
 hack/dockerfile/install/vndr.installer          |  5 +----
 6 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/Dockerfile.windows b/Dockerfile.windows
index d56fce719a..4fdbafc2de 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -274,21 +274,20 @@ RUN `
   C:\git\cmd\git config --global core.autocrlf true;
 
 RUN `
-  Function Build-GoTestSum() { `
-    Write-Host "INFO: Building gotestsum version $Env:GOTESTSUM_VERSION in $Env:GOPATH"; `
+  Function Install-GoTestSum() { `
     $Env:GO111MODULE = 'on'; `
     $tmpGobin = "${Env:GOBIN_TMP}"; `
     $Env:GOBIN = """${Env:GOPATH}`\bin"""; `
-    &go get -buildmode=exe "gotest.tools/gotestsum@${Env:GOTESTSUM_VERSION}"; `
+    Write-Host "INFO: Installing gotestsum version $Env:GOTESTSUM_VERSION in $Env:GOBIN"; `
+    &go install "gotest.tools/gotestsum@${Env:GOTESTSUM_VERSION}"; `
     $Env:GOBIN = "${tmpGobin}"; `
     $Env:GO111MODULE = 'off'; `
     if ($LASTEXITCODE -ne 0) {  `
-      Throw '"gotestsum build failed..."'; `
+      Throw '"gotestsum install failed..."'; `
     } `
-    Write-Host "INFO:     Build done for gotestsum..."; `
   } `
   `
-  Build-GoTestSum
+  Install-GoTestSum
 
 # Make PowerShell the default entrypoint
 ENTRYPOINT ["powershell.exe"]
diff --git a/hack/dockerfile/install/golangci_lint.installer b/hack/dockerfile/install/golangci_lint.installer
index 1bd43b5816..bcce308e15 100755
--- a/hack/dockerfile/install/golangci_lint.installer
+++ b/hack/dockerfile/install/golangci_lint.installer
@@ -4,7 +4,7 @@
 
 install_golangci_lint() {
 	set -e
-	export GO111MODULE=on
-	GOBIN="${PREFIX}" go get "github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}"
+	echo "Install golangci-lint version ${GOLANGCI_LINT_VERSION}"
+	GOBIN="${PREFIX}" GO111MODULE=on go install "github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}"
 	"${PREFIX}"/golangci-lint --version
 }
diff --git a/hack/dockerfile/install/gotestsum.installer b/hack/dockerfile/install/gotestsum.installer
index 21a8bbe2ba..0a86b054d3 100755
--- a/hack/dockerfile/install/gotestsum.installer
+++ b/hack/dockerfile/install/gotestsum.installer
@@ -4,6 +4,6 @@
 
 install_gotestsum() (
 	set -e
-	export GO111MODULE=on
-	GOBIN="${PREFIX}" go get "gotest.tools/gotestsum@${GOTESTSUM_VERSION}"
+	echo "Install gotestsum version ${GOTESTSUM_VERSION}"
+	GOBIN="${PREFIX}" GO111MODULE=on go install "gotest.tools/gotestsum@${GOTESTSUM_VERSION}"
 )
diff --git a/hack/dockerfile/install/shfmt.installer b/hack/dockerfile/install/shfmt.installer
index 4c73727d04..b9a125cfe6 100755
--- a/hack/dockerfile/install/shfmt.installer
+++ b/hack/dockerfile/install/shfmt.installer
@@ -4,8 +4,5 @@
 
 install_shfmt() {
 	echo "Install shfmt version $SHFMT_VERSION"
-	git clone https://github.com/mvdan/sh.git "$GOPATH/src/github.com/mvdan/sh"
-	cd "$GOPATH/src/github.com/mvdan/sh" || exit 1
-	git checkout -q "$SHFMT_VERSION"
-	GO111MODULE=on go build ${GO_BUILDMODE} -v -o "${PREFIX}/shfmt" ./cmd/shfmt
+	GOBIN="${PREFIX}" GO111MODULE=on go install "mvdan.cc/sh/v3/cmd/shfmt@${SHFMT_VERSION}"
 }
diff --git a/hack/dockerfile/install/tomll.installer b/hack/dockerfile/install/tomll.installer
index 066b9ccdd0..7277c9817f 100755
--- a/hack/dockerfile/install/tomll.installer
+++ b/hack/dockerfile/install/tomll.installer
@@ -4,6 +4,5 @@
 
 install_tomll() {
 	echo "Install go-toml version ${GOTOML_VERSION}"
-	# TODO remove GO111MODULE=on and change to 'go install -mod=mod ...' once we're at go 1.16+
-	GO111MODULE=on GOBIN="${PREFIX}" go get -v "github.com/pelletier/go-toml/cmd/tomll@${GOTOML_VERSION}"
+	GOBIN="${PREFIX}" GO111MODULE=on go install "github.com/pelletier/go-toml/cmd/tomll@${GOTOML_VERSION}"
 }
diff --git a/hack/dockerfile/install/vndr.installer b/hack/dockerfile/install/vndr.installer
index 00ac6ea89c..5611e3c9d8 100755
--- a/hack/dockerfile/install/vndr.installer
+++ b/hack/dockerfile/install/vndr.installer
@@ -4,8 +4,5 @@
 
 install_vndr() {
 	echo "Install vndr version $VNDR_VERSION"
-	git clone https://github.com/LK4D4/vndr.git "$GOPATH/src/github.com/LK4D4/vndr"
-	cd "$GOPATH/src/github.com/LK4D4/vndr" || exit 1
-	git checkout -q "$VNDR_VERSION"
-	go build ${GO_BUILDMODE} -v -o "${PREFIX}/vndr" .
+	GOBIN="${PREFIX}" GO111MODULE=on go install "github.com/LK4D4/vndr@${VNDR_VERSION}"
 }