Restore compose v1 behavior to recreate containers when ran with -V

Signed-off-by: Nicolas De Loof <[email protected]>
docker · Sep 11, 2024 · a742443 · a742443
1 parent d445ebb
commit a742443
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/cmd/compose/create.go b/cmd/compose/create.go
@@ -117,6 +117,9 @@ func (opts createOptions) recreateStrategy() string {
  if opts.forceRecreate {
  return api.RecreateForce
  }
+ if opts.noInherit {
+ return api.RecreateForce
+ }
  return api.RecreateDiverged
 }
 

diff --git a/cmd/compose/up.go b/cmd/compose/up.go
@@ -189,6 +189,9 @@ func validateFlags(up *upOptions, create *createOptions) error {
  if up.Detach && (up.attachDependencies || up.cascadeStop || up.cascadeFail || len(up.attach) > 0 || up.watch) {
  return fmt.Errorf("--detach cannot be combined with --abort-on-container-exit, --abort-on-container-failure, --attach, --attach-dependencies or --watch")
  }
+ if create.noInherit && create.noRecreate {
+ return fmt.Errorf("--no-recreate and --renew-anon-volumes are incompatible")
+ }
  if create.forceRecreate && create.noRecreate {
  return fmt.Errorf("--force-recreate and --no-recreate are incompatible")
  }