0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Dockerfile: use "go install" to install utilities

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 14ff070469)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2021-07-26 14:56:29 +02:00
parent b35a1707e3
commit 2716336abd
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
5 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Dockerfile.windows
View file

@ -261,21 +261,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"]

4
hack/dockerfile/install/golangci_lint.installer
View file

@ -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
}

4
hack/dockerfile/install/gotestsum.installer
View file

@ -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}"
)

5
hack/dockerfile/install/shfmt.installer
View file

@ -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}"
}

5
hack/dockerfile/install/vndr.installer
View file

@ -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}"
}