diff options
| -rw-r--r-- | common/build.go | 6 | ||||
| -rw-r--r-- | executors/docker/executor_docker.go | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/common/build.go b/common/build.go index fa11ef1b..14ddb467 100644 --- a/common/build.go +++ b/common/build.go @@ -389,10 +389,8 @@ func (b *Build) retryCreateExecutor(options ExecutorPrepareOptions, provider Exe if err == nil { break } - if executor != nil { - executor.Cleanup() - executor = nil - } + executor.Cleanup() + executor = nil if _, ok := err.(*BuildError); ok { break } else if options.Context.Err() != nil { diff --git a/executors/docker/executor_docker.go b/executors/docker/executor_docker.go index 12b83721..ecce4d40 100644 --- a/executors/docker/executor_docker.go +++ b/executors/docker/executor_docker.go @@ -128,10 +128,6 @@ func (e *executor) getBuildAuthConfiguration(indexName string) (string, *types.A } } - if authConfigs == nil { - return "", nil - } - return AuthConfigSourceNameJobPayload, docker_helpers.ResolveDockerAuthConfig(indexName, authConfigs) } |