Merge pull request moby#5734 from tonistiigi/copy-chmod-nonoctal

dockerfile: bring copy --chmod non-octal out of labs

Author: crazy-max

frontend/dockerfile/dockerfile2llb/convert.go

@@ -1443,18 +1443,14 @@ func dispatchCopy(d *dispatchState, cfg copyConfig) error {
 			}
 			chopt.Mode = os.FileMode(p)
 		} else {
-			if featureCopyChmodNonOctalEnabled {
-				if _, err := mode.Parse(cfg.chmod); err != nil {
-					var ne *strconv.NumError
-					if errors.As(err, &ne) {
-						return nonOctalErr // return nonOctalErr for compatibility if the value looks numeric
-					}
-					return err
+			if _, err := mode.Parse(cfg.chmod); err != nil {
+				var ne *strconv.NumError
+				if errors.As(err, &ne) {
+					return nonOctalErr // return nonOctalErr for compatibility if the value looks numeric
 				}
-				chopt.ModeStr = cfg.chmod
-			} else {
-				return nonOctalErr
+				return err
 			}
+			chopt.ModeStr = cfg.chmod
 		}
 	}
 

frontend/dockerfile/dockerfile2llb/copy_chmod_non_octal_disabled.go

@@ -1,5 +1,3 @@
-//go:build dfcopychmodnonoctal
-
 package dockerfile
 
 import (

frontend/dockerfile/dockerfile2llb/copy_chmod_non_octal_enabled.go

@@ -1 +1 @@
-dfrunsecurity dfparents dfexcludepatterns dfcopychmodnonoctal dfrundevice
+dfrunsecurity dfparents dfexcludepatterns dfrundevice