Skip to content

Commit 14ff070

Browse files
committed
Dockerfile: use "go install" to install utilities
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent a7a7c73 commit 14ff070

6 files changed

Lines changed: 12 additions & 20 deletions

File tree

Dockerfile.windows

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -274,21 +274,20 @@ RUN `
274274
C:\git\cmd\git config --global core.autocrlf true;
275275

276276
RUN `
277-
Function Build-GoTestSum() { `
278-
Write-Host "INFO: Building gotestsum version $Env:GOTESTSUM_VERSION in $Env:GOPATH"; `
277+
Function Install-GoTestSum() { `
279278
$Env:GO111MODULE = 'on'; `
280279
$tmpGobin = "${Env:GOBIN_TMP}"; `
281280
$Env:GOBIN = """${Env:GOPATH}`\bin"""; `
282-
&go get -buildmode=exe "gotest.tools/gotestsum@${Env:GOTESTSUM_VERSION}"; `
281+
Write-Host "INFO: Installing gotestsum version $Env:GOTESTSUM_VERSION in $Env:GOBIN"; `
282+
&go install "gotest.tools/gotestsum@${Env:GOTESTSUM_VERSION}"; `
283283
$Env:GOBIN = "${tmpGobin}"; `
284284
$Env:GO111MODULE = 'off'; `
285285
if ($LASTEXITCODE -ne 0) { `
286-
Throw '"gotestsum build failed..."'; `
286+
Throw '"gotestsum install failed..."'; `
287287
} `
288-
Write-Host "INFO: Build done for gotestsum..."; `
289288
} `
290289
`
291-
Build-GoTestSum
290+
Install-GoTestSum
292291

293292
# Make PowerShell the default entrypoint
294293
ENTRYPOINT ["powershell.exe"]

hack/dockerfile/install/golangci_lint.installer

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
install_golangci_lint() {
66
set -e
7-
export GO111MODULE=on
8-
GOBIN="${PREFIX}" go get "github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}"
7+
echo "Install golangci-lint version ${GOLANGCI_LINT_VERSION}"
8+
GOBIN="${PREFIX}" GO111MODULE=on go install "github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}"
99
"${PREFIX}"/golangci-lint --version
1010
}

hack/dockerfile/install/gotestsum.installer

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
install_gotestsum() (
66
set -e
7-
export GO111MODULE=on
8-
GOBIN="${PREFIX}" go get "gotest.tools/gotestsum@${GOTESTSUM_VERSION}"
7+
echo "Install gotestsum version ${GOTESTSUM_VERSION}"
8+
GOBIN="${PREFIX}" GO111MODULE=on go install "gotest.tools/gotestsum@${GOTESTSUM_VERSION}"
99
)

hack/dockerfile/install/shfmt.installer

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,5 @@
44

55
install_shfmt() {
66
echo "Install shfmt version $SHFMT_VERSION"
7-
git clone https://github.com/mvdan/sh.git "$GOPATH/src/github.com/mvdan/sh"
8-
cd "$GOPATH/src/github.com/mvdan/sh" || exit 1
9-
git checkout -q "$SHFMT_VERSION"
10-
GO111MODULE=on go build ${GO_BUILDMODE} -v -o "${PREFIX}/shfmt" ./cmd/shfmt
7+
GOBIN="${PREFIX}" GO111MODULE=on go install "mvdan.cc/sh/v3/cmd/shfmt@${SHFMT_VERSION}"
118
}

hack/dockerfile/install/tomll.installer

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@
44

55
install_tomll() {
66
echo "Install go-toml version ${GOTOML_VERSION}"
7-
# TODO remove GO111MODULE=on and change to 'go install -mod=mod ...' once we're at go 1.16+
8-
GO111MODULE=on GOBIN="${PREFIX}" go get -v "github.com/pelletier/go-toml/cmd/tomll@${GOTOML_VERSION}"
7+
GOBIN="${PREFIX}" GO111MODULE=on go install "github.com/pelletier/go-toml/cmd/tomll@${GOTOML_VERSION}"
98
}

hack/dockerfile/install/vndr.installer

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,5 @@
44

55
install_vndr() {
66
echo "Install vndr version $VNDR_VERSION"
7-
git clone https://github.com/LK4D4/vndr.git "$GOPATH/src/github.com/LK4D4/vndr"
8-
cd "$GOPATH/src/github.com/LK4D4/vndr" || exit 1
9-
git checkout -q "$VNDR_VERSION"
10-
go build ${GO_BUILDMODE} -v -o "${PREFIX}/vndr" .
7+
GOBIN="${PREFIX}" GO111MODULE=on go install "github.com/LK4D4/vndr@${VNDR_VERSION}"
118
}

0 commit comments

Comments
 (0)