diff --git a/Dockerfile b/Dockerfile index 46a8558a..9b88531f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \ FROM base AS lint ENV CGO_ENABLED=0 -COPY --from=lint-base /usr/bin/golangci-lint /usr/bin/golangci-lint +COPY --from=golangci/golangci-lint /usr/bin/golangci-lint /usr/bin/golangci-lint ARG BUILD_TAGS ARG GIT_TAG RUN --mount=target=. \ diff --git a/cmd/compose/compose.go b/cmd/compose/compose.go index 16247d5a..7f1834e5 100644 --- a/cmd/compose/compose.go +++ b/cmd/compose/compose.go @@ -44,6 +44,7 @@ import ( // Command defines a compose CLI command as a func with args type Command func(context.Context, []string) error +// CobraCommand defines a cobra command function type CobraCommand func(context.Context, *cobra.Command, []string) error // AdaptCmd adapt a CobraCommand func to cobra library diff --git a/pkg/e2e/cancel_test.go b/pkg/e2e/cancel_test.go index dc698dae..34bdf86a 100644 --- a/pkg/e2e/cancel_test.go +++ b/pkg/e2e/cancel_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows /*