mirror of https://github.com/docker/compose.git
fix combination of --pull always --no-build
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
parent
c5824702bf
commit
ce1ddb6c7e
|
@ -159,16 +159,6 @@ func (opts createOptions) Apply(project *types.Project) error {
|
||||||
project.Services[i] = service
|
project.Services[i] = service
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// opts.noBuild, however, means do not perform ANY builds
|
|
||||||
if opts.noBuild {
|
|
||||||
for i, service := range project.Services {
|
|
||||||
service.Build = nil
|
|
||||||
if service.Image == "" {
|
|
||||||
service.Image = api.GetImageNameOrDefault(service, project.Name)
|
|
||||||
}
|
|
||||||
project.Services[i] = service
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := applyPlatforms(project, true); err != nil {
|
if err := applyPlatforms(project, true); err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
|
@ -177,8 +177,6 @@ func runUp(
|
||||||
}
|
}
|
||||||
|
|
||||||
var build *api.BuildOptions
|
var build *api.BuildOptions
|
||||||
// this check is technically redundant as createOptions::apply()
|
|
||||||
// already removed all the build sections
|
|
||||||
if !createOptions.noBuild {
|
if !createOptions.noBuild {
|
||||||
if createOptions.quietPull {
|
if createOptions.quietPull {
|
||||||
buildOptions.Progress = string(xprogress.QuietMode)
|
buildOptions.Progress = string(xprogress.QuietMode)
|
||||||
|
|
Loading…
Reference in New Issue