Skip to content

Commit c47b8c3

Browse files
thaJeztahndeloof
authored andcommitted
Dockerfile: update golangci-lint to v2.6.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 89d3944 commit c47b8c3

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
ARG GO_VERSION=1.24.9
1919
ARG XX_VERSION=1.6.1
20-
ARG GOLANGCI_LINT_VERSION=v2.0.2
20+
ARG GOLANGCI_LINT_VERSION=v2.6.2
2121
ARG ADDLICENSE_VERSION=v1.0.0
2222

2323
ARG BUILD_TAGS="e2e"

cmd/compose/compose.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,8 @@ func (o *ProjectOptions) toProjectOptions(po ...cli.ProjectOptionsFn) (*cli.Proj
393393
// if none was selected, get default compose.yaml file from current dir or parent folder
394394
cli.WithDefaultConfigPath,
395395
// .. and then, a project directory != PWD maybe has been set so let's load .env file
396-
cli.WithEnvFiles(o.EnvFiles...),
397-
cli.WithDotEnv,
396+
cli.WithEnvFiles(o.EnvFiles...), //nolint:gocritic // intentionally applying cli.WithEnvFiles twice.
397+
cli.WithDotEnv, //nolint:gocritic // intentionally applying cli.WithDotEnv twice.
398398
// eventually COMPOSE_PROFILES should have been set
399399
cli.WithDefaultProfiles(o.Profiles...),
400400
cli.WithName(o.ProjectName),

pkg/compose/loader.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ func (s *composeService) buildProjectOptions(options api.ProjectLoadOptions, rem
104104
// if none was selected, get default compose.yaml file from current dir or parent folder
105105
cli.WithDefaultConfigPath,
106106
// .. and then, a project directory != PWD maybe has been set so let's load .env file
107-
cli.WithEnvFiles(options.EnvFiles...),
108-
cli.WithDotEnv,
107+
cli.WithEnvFiles(options.EnvFiles...), //nolint:gocritic // intentionally applying cli.WithEnvFiles twice.
108+
cli.WithDotEnv, //nolint:gocritic // intentionally applying cli.WithDotEnv twice.
109109
// eventually COMPOSE_PROFILES should have been set
110110
cli.WithDefaultProfiles(options.Profiles...),
111111
cli.WithName(options.ProjectName),

0 commit comments

Comments
 (0)