Merge pull request moby#3979 from AkihiroSuda/graduate-addgit

dockerfile: graduate `ADD <git ref>` and `ADD --checksum=<checksum>` from labs

Author: tonistiigi

.golangci.yml

@@ -7,8 +7,6 @@ run:
 
   build-tags:
     - dfrunsecurity
-    - dfaddgit
-    - dfaddchecksum
 
 linters:
   enable:

frontend/dockerfile/dockerfile2llb/convert.go

@@ -1055,9 +1055,6 @@ func dispatchCopy(d *dispatchState, cfg copyConfig) error {
 		if !cfg.isAddCommand {
 			return errors.New("checksum can't be specified for COPY")
 		}
-		if !addChecksumEnabled {
-			return errors.New("instruction 'ADD --checksum=<CHECKSUM>' requires the labs channel")
-		}
 		if len(cfg.params.SourcePaths) != 1 {
 			return errors.New("checksum can't be specified for multiple sources")
 		}
@@ -1082,9 +1079,6 @@ func dispatchCopy(d *dispatchState, cfg copyConfig) error {
 			if !cfg.isAddCommand {
 				return errors.New("source can't be a git ref for COPY")
 			}
-			if !addGitEnabled {
-				return errors.New("instruction ADD <git ref> requires the labs channel")
-			}
 			// TODO: print a warning (not an error) if gitRef.UnencryptedTCP is true
 			commit := gitRef.Commit
 			if gitRef.SubDir != "" {

frontend/dockerfile/dockerfile2llb/convert_addchecksum.go

@@ -1,6 +1,3 @@
-//go:build dfaddchecksum
-// +build dfaddchecksum
-
 package dockerfile
 
 import (

frontend/dockerfile/dockerfile2llb/convert_addgit.go

@@ -1,6 +1,3 @@
-//go:build dfaddgit
-// +build dfaddgit
-
 package dockerfile
 
 import (

frontend/dockerfile/dockerfile2llb/convert_noaddchecksum.go

@@ -1298,6 +1298,7 @@ guide – Leverage build cache](https://docs.docker.com/develop/develop-images/d
 > **Note**
 >
 > Not yet available in stable syntax, use [`docker/dockerfile:1-labs`](#syntax) version (`1.5-labs` or newer).
+> Planned to be included in `docker/dockerfile:1.6`.
 
 The checksum of a remote file can be verified with the `--checksum` flag:
 
@@ -1312,6 +1313,7 @@ The `--checksum` flag only supports HTTP sources currently.
 > **Note**
 >
 > Not yet available in stable syntax, use [`docker/dockerfile:1-labs`](#syntax) version (`1.5-labs` or newer).
+> Planned to be included in `docker/dockerfile:1.6`.
 
 This form allows adding a git repository to an image directly, without using the `git` command inside the image:
 ```

frontend/dockerfile/dockerfile2llb/convert_noaddgit.go

@@ -1 +1 @@
-dfrunsecurity dfaddgit dfaddchecksum
+dfrunsecurity