Browse Source

Dockerfile: update golangci-lint to v2.6.2

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Sebastiaan van Stijn 1 month ago
parent
commit
c47b8c32e3
3 changed files with 5 additions and 5 deletions
  1. 1 1
      Dockerfile
  2. 2 2
      cmd/compose/compose.go
  3. 2 2
      pkg/compose/loader.go

+ 1 - 1
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"

+ 2 - 2
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),

+ 2 - 2
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),