From c47b8c32e31340021fe337c82e52f055fd7dbff9 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 11 Nov 2025 01:04:30 +0100 Subject: [PATCH] Dockerfile: update golangci-lint to v2.6.2 Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- cmd/compose/compose.go | 4 ++-- pkg/compose/loader.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9b47ed859..1488c84e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ ARG GO_VERSION=1.24.9 ARG XX_VERSION=1.6.1 -ARG GOLANGCI_LINT_VERSION=v2.0.2 +ARG GOLANGCI_LINT_VERSION=v2.6.2 ARG ADDLICENSE_VERSION=v1.0.0 ARG BUILD_TAGS="e2e" diff --git a/cmd/compose/compose.go b/cmd/compose/compose.go index fef0ed45f..6f6502e9d 100644 --- a/cmd/compose/compose.go +++ b/cmd/compose/compose.go @@ -393,8 +393,8 @@ func (o *ProjectOptions) toProjectOptions(po ...cli.ProjectOptionsFn) (*cli.Proj // if none was selected, get default compose.yaml file from current dir or parent folder cli.WithDefaultConfigPath, // .. and then, a project directory != PWD maybe has been set so let's load .env file - cli.WithEnvFiles(o.EnvFiles...), - cli.WithDotEnv, + cli.WithEnvFiles(o.EnvFiles...), //nolint:gocritic // intentionally applying cli.WithEnvFiles twice. + cli.WithDotEnv, //nolint:gocritic // intentionally applying cli.WithDotEnv twice. // eventually COMPOSE_PROFILES should have been set cli.WithDefaultProfiles(o.Profiles...), cli.WithName(o.ProjectName), diff --git a/pkg/compose/loader.go b/pkg/compose/loader.go index 9b39ab74b..6e203012c 100644 --- a/pkg/compose/loader.go +++ b/pkg/compose/loader.go @@ -104,8 +104,8 @@ func (s *composeService) buildProjectOptions(options api.ProjectLoadOptions, rem // if none was selected, get default compose.yaml file from current dir or parent folder cli.WithDefaultConfigPath, // .. and then, a project directory != PWD maybe has been set so let's load .env file - cli.WithEnvFiles(options.EnvFiles...), - cli.WithDotEnv, + cli.WithEnvFiles(options.EnvFiles...), //nolint:gocritic // intentionally applying cli.WithEnvFiles twice. + cli.WithDotEnv, //nolint:gocritic // intentionally applying cli.WithDotEnv twice. // eventually COMPOSE_PROFILES should have been set cli.WithDefaultProfiles(options.Profiles...), cli.WithName(options.ProjectName),