Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4946 from thaJeztah/bump_gofumpt 

Dockerfile: update mvdan/gofumpt to v0.6.0
This commit is contained in:
Sebastiaan van Stijn 2024-03-18 12:24:26 +01:00 committed by GitHub
parent 4eef4afbf4 48b5efee03
commit c050bf0909
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -52,7 +52,7 @@ shellcheck: ## run shellcheck validation
.PHONY: fmt .PHONY: fmt
fmt: ## run gofumpt (if present) or gofmt fmt: ## run gofumpt (if present) or gofmt
@if command -v gofumpt > /dev/null; then \ @if command -v gofumpt > /dev/null; then \
gofumpt -w -d -lang=1.19 . ; \ gofumpt -w -d -lang=1.21 . ; \
else \ else \
go list -f {{.Dir}} ./... | xargs gofmt -w -s -d ; \ go list -f {{.Dir}} ./... | xargs gofmt -w -s -d ; \
fi fi

1
cli/command/image/build/context_test.go
View File

@ -129,7 +129,6 @@ func TestGetContextFromReaderString(t *testing.T) {
tarReader := tar.NewReader(tarArchive) tarReader := tar.NewReader(tarArchive)
_, err = tarReader.Next() _, err = tarReader.Next()
if err != nil { if err != nil {
t.Fatalf("Error when reading tar archive: %s", err) t.Fatalf("Error when reading tar archive: %s", err)
} }

1
cli/command/plugin/create.go
View File

@ -114,7 +114,6 @@ func runCreate(ctx context.Context, dockerCli command.Cli, options pluginCreateO
createCtx, err = archive.TarWithOptions(absContextDir, &archive.TarOptions{ createCtx, err = archive.TarWithOptions(absContextDir, &archive.TarOptions{
Compression: compression, Compression: compression,
}) })
if err != nil { if err != nil {
return err return err
} }

2
dockerfiles/Dockerfile.dev
View File

@ -11,7 +11,7 @@ ENV GOTOOLCHAIN=local
ENV CGO_ENABLED=0 ENV CGO_ENABLED=0
FROM golang AS gofumpt FROM golang AS gofumpt
ARG GOFUMPT_VERSION=v0.4.0 ARG GOFUMPT_VERSION=v0.6.0
RUN --mount=type=cache,target=/root/.cache/go-build \ RUN --mount=type=cache,target=/root/.cache/go-build \
--mount=type=cache,target=/go/pkg/mod \ --mount=type=cache,target=/go/pkg/mod \
--mount=type=tmpfs,target=/go/src/ \ --mount=type=tmpfs,target=/go/src/ \